Changes 1.8.4:

* AI:
  * Fixed bug #16102: Made AI cancel attacks if a previously valid attack
    was made invalid by WML event after move in move+attack sequence.
  * Allowed custom eras to define Lua AI modifications for games played with
    this era.
* Campaigns:
  * Delfadors Memoirs:
    * Make Lionel's portrait in Delfador's Memoirs story
      screens the same as his unit portrait since there doesn't seem to be a
      current higher-res version available
  * Descent into Darkness:
    * Made 'Alone at Last' slightly easier. Also, Dela is no longer
      invulnerable but cannot be assassinated easily.
  * Legend of Wesmere:
    * removed gold overlay when defeating both leaders
    * Reduced the difficulty of scenario 14 and improved the AI of the ally.
  * Liberty:
    * Increased the difficulty in 'Glory' by making the defenders behave more
      intelligently.
* Language and i18n:
  * Updated translations: Chinese (Simplified), Galician, Japanese, Serbian,
    Vietnamese
  * Flushed image cache when changing language
* Miscellaneous and bug fixes:
  * Ensured graceful failure when encountering broken [advancefrom] tag.
  * Handled ToD areas in a LIFO way, so that it is possible
    to override them without first removing them
  * Avoided displaying an empty menu and therefore choosing
    a random weapon, when there is none
  * Added detection for server replays, as they are missing the core [lua] tags
  * Fixed attack_end event not raised for uncommon swarm attacks
  * Added test for invalidated death due to positive hp after the 'die' event
  * 1.9 syntax creeped into 1.8.x causing segfaults
  * Fixed petrifying in multiround combats
  * Fixed reference binded to a temporary, possibly the cause of the failure
    on arklinux
  * Never allow uploading *.pbl files (case-insensitive) to the add-ons
    server from the regular game client
  * Fixed revision.hpp generation with cmake 1.8(.2)
  * Fixed usage of first PKG_CHECK_MODULES inside a shell conditional
  * Fixed broken attack animatio

11 files changed, 1649 insertions, 517 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0cbefc15460..43340a2606f 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:24 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/08/28 20:08:40 adam Exp $
 
-DISTNAME=	wesnoth-1.6.4
-PKGREVISION=	4
+DISTNAME=	wesnoth-1.8.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,11 +14,12 @@ BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+#USE_CMAKE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		aclocal autoconf autoheader automake pkg-config
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
 
 UNLIMIT_RESOURCES+=	datasize
 
@@ -65,6 +65,10 @@ REPLACE_SH+=		data/tools/castle-cutter/mk-all-castles.sh
 USE_TOOLS+=	gmake
 .endif
 
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal -I m4; autoheader; automake -a --foreign -i; autoconf
+
 BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb3
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
@@ -79,6 +83,7 @@ BUILDLINK_API_DEPENDS.pango+=	pango>=1.14.8
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 8a08eb00f27..8fa91fa355f 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.31 2009/07/18 14:02:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2010/08/28 20:08:40 adam Exp $
+@pkgdir var/run/wesnothd
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnoth.6
@@ -9,28 +10,38 @@ man/en_GB/man6/wesnoth.6
 man/en_GB/man6/wesnothd.6
 man/es/man6/wesnoth.6
 man/es/man6/wesnothd.6
+man/et/man6/wesnoth.6
+man/et/man6/wesnothd.6
 man/fi/man6/wesnoth.6
 man/fi/man6/wesnothd.6
 man/fr/man6/wesnoth.6
 man/fr/man6/wesnothd.6
 man/gl/man6/wesnoth.6
+man/gl/man6/wesnothd.6
 man/hu/man6/wesnoth.6
 man/hu/man6/wesnothd.6
 man/it/man6/wesnoth.6
 man/it/man6/wesnothd.6
+man/ja/man6/wesnoth.6
+man/ja/man6/wesnothd.6
 man/lt/man6/wesnoth.6
 man/lt/man6/wesnothd.6
 man/man6/wesnoth.6
 man/man6/wesnothd.6
 man/pl/man6/wesnoth.6
 man/pl/man6/wesnothd.6
+man/pt_BR/man6/wesnoth.6
+man/pt_BR/man6/wesnothd.6
 man/sk/man6/wesnoth.6
+man/sk/man6/wesnothd.6
 man/sr/man6/wesnoth.6
 man/sr/man6/wesnothd.6
+man/sr@ijekavian/man6/wesnoth.6
+man/sr@ijekavian/man6/wesnothd.6
+man/sr@ijekavianlatin/man6/wesnoth.6
+man/sr@ijekavianlatin/man6/wesnothd.6
 man/sr@latin/man6/wesnoth.6
 man/sr@latin/man6/wesnothd.6
-man/sv/man6/wesnoth.6
-man/sv/man6/wesnothd.6
 man/tr/man6/wesnoth.6
 man/tr/man6/wesnothd.6
 man/zh_CN/man6/wesnoth.6
@@ -52,6 +63,12 @@ share/doc/wesnoth/manual/images/es/multiplayer-1.5.11.jpg
 share/doc/wesnoth/manual/images/es/recruit-1.5.7.jpg
 share/doc/wesnoth/manual/images/es/right_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/es/top_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/fr/game-screen-1.5.7.jpg
+share/doc/wesnoth/manual/images/fr/main-menu-1.5.11.jpg
+share/doc/wesnoth/manual/images/fr/multiplayer-1.5.11.jpg
+share/doc/wesnoth/manual/images/fr/recruit-1.5.7.jpg
+share/doc/wesnoth/manual/images/fr/right_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/fr/top_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/game-screen-1.5.7.jpg
 share/doc/wesnoth/manual/images/hu/game-screen-1.5.7.jpg
 share/doc/wesnoth/manual/images/hu/main-menu-1.5.11.jpg
@@ -59,6 +76,12 @@ share/doc/wesnoth/manual/images/hu/multiplayer-1.5.11.jpg
 share/doc/wesnoth/manual/images/hu/recruit-1.5.7.jpg
 share/doc/wesnoth/manual/images/hu/right_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/hu/top_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/it/game-screen-1.5.7.jpg
+share/doc/wesnoth/manual/images/it/main-menu-1.5.11.jpg
+share/doc/wesnoth/manual/images/it/multiplayer-1.5.11.jpg
+share/doc/wesnoth/manual/images/it/recruit-1.5.7.jpg
+share/doc/wesnoth/manual/images/it/right_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/it/top_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/main-menu-1.5.11.jpg
 share/doc/wesnoth/manual/images/multiplayer-1.5.11.jpg
 share/doc/wesnoth/manual/images/orb-blue.jpg
@@ -68,6 +91,30 @@ share/doc/wesnoth/manual/images/orb-red.jpg
 share/doc/wesnoth/manual/images/orb-yellow.jpg
 share/doc/wesnoth/manual/images/recruit-1.5.7.jpg
 share/doc/wesnoth/manual/images/right_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/sr/game-screen-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr/main-menu-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr/multiplayer-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr/recruit-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr/right_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr/top_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/game-screen-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/main-menu-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/multiplayer-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/recruit-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/right_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavian/top_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/game-screen-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/main-menu-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/multiplayer-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/recruit-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/right_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@ijekavianlatin/top_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/game-screen-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/main-menu-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/multiplayer-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/recruit-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/right_pane-1.7.10.jpg
+share/doc/wesnoth/manual/images/sr@latin/top_pane-1.7.10.jpg
 share/doc/wesnoth/manual/images/top_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/tr/game-screen-1.5.7.jpg
 share/doc/wesnoth/manual/images/tr/main-menu-1.5.11.jpg
@@ -75,10 +122,16 @@ share/doc/wesnoth/manual/images/tr/multiplayer-1.5.11.jpg
 share/doc/wesnoth/manual/images/tr/recruit-1.5.7.jpg
 share/doc/wesnoth/manual/images/tr/right_pane-1.5.7.jpg
 share/doc/wesnoth/manual/images/tr/top_pane-1.5.7.jpg
+share/doc/wesnoth/manual/images/zh_CN/game-screen-1.8.0.jpg
+share/doc/wesnoth/manual/images/zh_CN/main-menu-1.8.0.jpg
+share/doc/wesnoth/manual/images/zh_CN/multiplayer-1.8.0.jpg
+share/doc/wesnoth/manual/images/zh_CN/recruit-1.8.0.jpg
+share/doc/wesnoth/manual/images/zh_CN/right_pane-1.8.0.jpg
+share/doc/wesnoth/manual/images/zh_CN/top_pane-1.8.0.jpg
 share/doc/wesnoth/manual/manual.cs.html
-share/doc/wesnoth/manual/manual.da.html
 share/doc/wesnoth/manual/manual.de.html
 share/doc/wesnoth/manual/manual.en.html
+share/doc/wesnoth/manual/manual.en@shaw.html
 share/doc/wesnoth/manual/manual.en_GB.html
 share/doc/wesnoth/manual/manual.es.html
 share/doc/wesnoth/manual/manual.et.html
@@ -89,8 +142,10 @@ share/doc/wesnoth/manual/manual.hu.html
 share/doc/wesnoth/manual/manual.it.html
 share/doc/wesnoth/manual/manual.pl.html
 share/doc/wesnoth/manual/manual.pt_BR.html
-share/doc/wesnoth/manual/manual.ru.html
-share/doc/wesnoth/manual/manual.sv.html
+share/doc/wesnoth/manual/manual.sr.html
+share/doc/wesnoth/manual/manual.sr@ijekavian.html
+share/doc/wesnoth/manual/manual.sr@ijekavianlatin.html
+share/doc/wesnoth/manual/manual.sr@latin.html
 share/doc/wesnoth/manual/manual.tr.html
 share/doc/wesnoth/manual/manual.txt
 share/doc/wesnoth/manual/manual.zh_CN.html
@@ -100,15 +155,54 @@ share/icons/wesnoth-icon.png
 share/icons/wesnoth_editor-icon.png
 share/wesnoth/data/COPYING.txt
 share/wesnoth/data/_main.cfg
+share/wesnoth/data/advanced_preferences.cfg
+share/wesnoth/data/ai/ais/default_ai.cfg
+share/wesnoth/data/ai/ais/testing_ai_default.cfg
+share/wesnoth/data/ai/aliases/dev_singleplayer.cfg
+share/wesnoth/data/ai/aliases/idle.cfg
+share/wesnoth/data/ai/aliases/stable_singleplayer.cfg
+share/wesnoth/data/ai/dev/formula_ai.cfg
+share/wesnoth/data/ai/dev/formula_ai_poisoning.cfg
+share/wesnoth/data/ai/dev/idle_ai.cfg
 share/wesnoth/data/ai/formula/level_up_attack_eval.fai
 share/wesnoth/data/ai/formula/level_up_attack_move.fai
+share/wesnoth/data/ai/formula/lib/map_evaluation.fai
+share/wesnoth/data/ai/formula/lib/recruitment.fai
+share/wesnoth/data/ai/formula/lib/util.fai
+share/wesnoth/data/ai/formula/new_recruitment.fai
 share/wesnoth/data/ai/formula/opening.fai
 share/wesnoth/data/ai/formula/patrol.fai
+share/wesnoth/data/ai/formula/poisoner_attack.fai
+share/wesnoth/data/ai/formula/poisoner_eval.fai
 share/wesnoth/data/ai/formula/recruitment.fai
 share/wesnoth/data/ai/formula/scouting_eval.fai
 share/wesnoth/data/ai/formula/scouting_move.fai
+share/wesnoth/data/ai/lua/stdlib.lua
+share/wesnoth/data/ai/maps/scenario-AI_Arena_small.map
+share/wesnoth/data/ai/maps/scenario-test_move_to_targets.map
+share/wesnoth/data/ai/scenarios/ai_arena_small/0001-healing.cfg
+share/wesnoth/data/ai/scenarios/ai_arena_small/0002-poisoning.cfg
+share/wesnoth/data/ai/scenarios/ai_arena_small/0003-simple_combat.cfg
+share/wesnoth/data/ai/scenarios/ai_arena_small/0004-filtered_combat.cfg
+share/wesnoth/data/ai/scenarios/scenario-AI_Arena_small.cfg
+share/wesnoth/data/ai/scenarios/scenario-lua-ai.cfg
+share/wesnoth/data/ai/scenarios/scenario-test_move_to_targets.cfg
+share/wesnoth/data/ai/utils/default_config.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/_main.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/an-orcish-incursion-map.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/campaign_image.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/de/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/es/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/fr/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/hu/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/it/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/lt/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/ru/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@ijekavian/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@ijekavianlatin/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@latin/an-orcish-incursion-map--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/zh_CN/an-orcish-incursion-map--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/1_Defend_the_forest.map
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/2_Assassins.map
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/3_Wasteland.map
@@ -124,9 +218,133 @@ share/wesnoth/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.c
 share/wesnoth/data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/utils/journey.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/HISTORY
+share/wesnoth/data/campaigns/Delfadors_Memoirs/TODO
+share/wesnoth/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
+share/wesnoth/data/campaigns/Delfadors_Memoirs/_main.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/LandOfTheDead.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/LandOfTheDeadIllum.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/campaign_image.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-ranged-halo1.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-ranged-halo2.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-ranged-halo3.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-ranged-halo4.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo1.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo2.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo3.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo4.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo5.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo6.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo7.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo8.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/items/ward-circle.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/README
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/chantal-druid.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/chantal-shyde.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/eldred.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/garard.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/kalenz.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/lionel.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/methor.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/old_delfador.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/oracle1.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/oracle2.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/oracle3.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/oracle4.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/tomb-guardian.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/ur-thorodor.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/young_delfador.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/zorlan.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/httt_story3.jpg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/garard-large.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/sagus.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/young_delfador-large.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss1.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss2.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss3.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss4.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss5.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss6.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/ethereal-abyss7.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/units/wose-shaman-attack-1.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/units/wose-shaman-attack-2.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/units/wose-shaman.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/young_delfador.png
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/dead1.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/dead2.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/face.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/four_oracles.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/home.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/island.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/leollyn.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/manor.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/new_ally.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/parthyn_ford.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/plains.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/portal.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/prince.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/return.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/road1.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/save_the_prince.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/shadows.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/showdown.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/swamp.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/swamp2.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/wasteland.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/maps/weldyn.map
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/01_overture.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/02_this_valley_belongs_to_me.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/03_road_to_weldyn.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/04_leollyn.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/05_council_in_weldyn.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/06_swamps_of_illuven.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/09_houses_of_the_dead.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/10_the_gate_between_worlds.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/11_wasteland.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/13_the_return_of_trouble.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/14_shadows.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/15_save_the_king.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/16_dark_sky_over_weldyn.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/18_the_portal_of_doom.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/22_face_of_the_enemy.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/23_epilogue.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/sounds/rumble.wav
+share/wesnoth/data/campaigns/Delfadors_Memoirs/terrain-graphics/_final.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/terrain.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/timeline.txt
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/dm-macros.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/generators.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/items.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/journey.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/misc.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/schedules.cfg
+share/wesnoth/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/_main.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/campaign_image.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/book-icon.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/descent-into-darkness.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/de/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/es/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/fr/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/hu/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/it/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/lt/descent-into-darkness--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/zh_CN/descent-into-darkness--overlay.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/makeshift-altar.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/weakened-ice.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/portraits/darken_volk.png
@@ -164,7 +382,18 @@ share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/ghast-attack1.pn
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/ghast-attack2.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/ghast-defend.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/ghast.png
-share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-1.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-2.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-3.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-4.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-5.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-6.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-attack-7.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-defend-1.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-defend-2.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-die-1.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-die-2.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat-die-3.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/giant-rat.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/neutral-outlaw-princess-attack-sling1.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/units/neutral-outlaw-princess-attack-sling2.png
@@ -216,6 +445,17 @@ share/wesnoth/data/campaigns/Eastern_Invasion/_main.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/images/campaign_image.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/items/horse-cage.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/de/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/es/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/fr/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/hu/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/it/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/lt/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@ijekavian/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@ijekavianlatin/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@latin/eastern-invasion-map--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/zh_CN/eastern-invasion-map--overlay.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/dacyn.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/gweddry.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/konrad_II.png
@@ -289,6 +529,7 @@ share/wesnoth/data/campaigns/Heir_To_The_Throne/_main.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/campaign_image.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/icon_armor.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/asheviere.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/chantal-shyde.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/delfador.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/kalenz.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/konrad-angry.png
@@ -461,18 +702,27 @@ share/wesnoth/data/campaigns/Legend_of_Wesmere/HISTORY
 share/wesnoth/data/campaigns/Legend_of_Wesmere/_main.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/ai/patrol.fai
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/campaign_image.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/de/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/es/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/fr/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/hu/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/it/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/lt/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@ijekavian/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@ijekavianlatin/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@latin/legend-of-wesmere-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/zh_CN/legend-of-wesmere-map--overlay.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/legend-of-wesmere-map.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/aldar.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/cleodil.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/crelanu.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/galtrid.png
-share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/kalenz.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/kalenz_young.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/landar.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/olurf.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/uradredia.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/velon.png
-share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/Thoria.jpeg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/Thoria0.jpeg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/aldar.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/cleodil.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/crelanu.png
@@ -485,8 +735,8 @@ share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/legmir.pn
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/lord.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/olurf.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/uradredia.png
-share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/hostmountains.jpeg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/snow.jpeg
+share/wesnoth/data/campaigns/Legend_of_Wesmere/lua/label.lua
+share/wesnoth/data/campaigns/Legend_of_Wesmere/lua/replace_map.lua
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/02_Hostile_mountains.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/04_Elvish_Treasury.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
@@ -495,13 +745,15 @@ share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_book.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/14_Human_Alliance.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/16_The_Chief_must_die.map
-share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/19_Costly_Revenge.tomerge
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/23_End_of_War.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/Kalian.map
+share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/Lintanir.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/North_Elves.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/Saurgrath.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/01_Uprooting.mask
+share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/01_Uprooting_MP.mask
+share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/02_Hostile_Mountains_MP.mask
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/03_Kalian.mask
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/05_Saurian_Treasury.mask
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/07_Elves_last_stand.mask
@@ -536,12 +788,11 @@ share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/24_Epilogue.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/ai_controller.deprecated
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/debug.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/journey.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
+share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
 share/wesnoth/data/campaigns/Liberty/_main.cfg
 share/wesnoth/data/campaigns/Liberty/images/attacks/sword-astral.png
 share/wesnoth/data/campaigns/Liberty/images/campaign_image.png
@@ -555,6 +806,17 @@ share/wesnoth/data/campaigns/Liberty/images/halo/shadow-mage-halo6.png
 share/wesnoth/data/campaigns/Liberty/images/halo/shadow-mage-halo7.png
 share/wesnoth/data/campaigns/Liberty/images/halo/shadow-mage-halo8.png
 share/wesnoth/data/campaigns/Liberty/images/halo/shadow-mage-halo9.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/de/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/es/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/fr/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/hu/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/it/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/lt/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@ijekavian/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@ijekavianlatin/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@latin/liberty-map--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/zh_CN/liberty-map--overlay.png
 share/wesnoth/data/campaigns/Liberty/images/maps/liberty-map.png
 share/wesnoth/data/campaigns/Liberty/images/portraits/p_baldras.png
 share/wesnoth/data/campaigns/Liberty/images/portraits/p_gwydion.png
@@ -626,7 +888,7 @@ share/wesnoth/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
-share/wesnoth/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
+share/wesnoth/data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/08_Glory.cfg
 share/wesnoth/data/campaigns/Liberty/scenarios/09_Epilog.cfg
@@ -642,6 +904,7 @@ share/wesnoth/data/campaigns/Liberty/utils/journey.cfg
 share/wesnoth/data/campaigns/Liberty/utils/utils.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/_main.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/images/campaign_image.jpg
+share/wesnoth/data/campaigns/Northern_Rebirth/images/floor-corpse.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/hatchling.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/portraits/Arthian.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/portraits/Camerin.png
@@ -696,10 +959,12 @@ share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/journey.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/utils.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/_main.cfg
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/campaign_image.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/items/coal.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/items/gold.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/misc/coal-icon.png
@@ -774,7 +1039,7 @@ share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
-share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
+share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
@@ -794,6 +1059,9 @@ share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/flags/black-flag-2.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/flags/black-flag-3.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/flags/black-flag-icon.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/items/barrel-floating.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/l10n/hu/farnorth.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/l10n/it/farnorth--overlay.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/l10n/ru/farnorth--overlay.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/flartar.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/gruu.png
@@ -865,6 +1133,7 @@ share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/utils/journey.cfg
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/_main.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/changelog
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/campaign_image.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/halo/karrag-attack1_halo.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/halo/karrag-attack2_halo.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/halo/karrag-attack3_halo.png
@@ -1076,9 +1345,26 @@ share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/knight.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/lady_outlaw.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/logalmier.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/rithrandil.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/shekkahan.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/typhon.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/east.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/fall_of_eldaric.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/es/trow-logo.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/east.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-blackmore.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-clearwater.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-jevyan.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-southbay.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-stormvale.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-thegreenisle.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/west.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/east.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-clearwater.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-southbay.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-thegreenisle.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/trow-logo.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/west.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/la/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/prince_finds_wesnoth.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/rough_landing.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/story1.png
@@ -1119,9 +1405,13 @@ share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-youth-attack
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-youth-attack2.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-youth-defend.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-youth.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-attack.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-bite-1.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-bite-2.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-bite-3.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-bite-4.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-defend.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-range.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-magic-1.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady-magic-2.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/undead-vampirelady.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-lady-defend-1-1.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-lady-defend-1-2.png
@@ -1227,7 +1517,6 @@ share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Flee
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/units/Fireball.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
@@ -1246,6 +1535,7 @@ share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-nlmsg.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-story.cfg
 share/wesnoth/data/campaigns/The_South_Guard/_main.cfg
+share/wesnoth/data/campaigns/The_South_Guard/images/campaign_image.png
 share/wesnoth/data/campaigns/The_South_Guard/images/deoran/dismounted-commander-attack1.png
 share/wesnoth/data/campaigns/The_South_Guard/images/deoran/dismounted-commander-attack2.png
 share/wesnoth/data/campaigns/The_South_Guard/images/deoran/dismounted-commander-defend.png
@@ -1334,8 +1624,6 @@ share/wesnoth/data/campaigns/The_South_Guard/utils/sg_help.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_story.cfg
 share/wesnoth/data/campaigns/The_South_Guard/utils/sg_utils.cfg
 share/wesnoth/data/campaigns/Two_Brothers/_main.cfg
-share/wesnoth/data/campaigns/Two_Brothers/images/arne.png
-share/wesnoth/data/campaigns/Two_Brothers/images/bjarn.png
 share/wesnoth/data/campaigns/Two_Brothers/images/campaign_image.png
 share/wesnoth/data/campaigns/Two_Brothers/images/story/Two_Brothers_M1P1.png
 share/wesnoth/data/campaigns/Two_Brothers/images/story/Two_Brothers_M1P2.png
@@ -1353,8 +1641,18 @@ share/wesnoth/data/campaigns/Two_Brothers/scenarios/5_Epilog.cfg
 share/wesnoth/data/campaigns/Two_Brothers/utils/journey.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/TODO
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/_main.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/note
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_01
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_02
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_03
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_04
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_05
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_06a
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/docs/scenario_06b
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/fangs-ant.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/fist-golem.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/sand-storm.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/campaign_image.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/dragonstatue-old.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/kaleh-dead.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-n.png
@@ -1432,32 +1730,6 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-ranged2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/spire.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-ranged1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-ranged2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-ranged3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-ranged4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-ranged1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-ranged2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-ranged3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder-ranged4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/pathfinder.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-ranged1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-ranged2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout-ranged3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/scout.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack3.png
@@ -1838,6 +2110,10 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/firegh
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/fireghost-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/fireghost-ranged2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/fireghost.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png
@@ -1945,9 +2221,6 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Desert_Star.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Divine_Avatar.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Divine_Incarnation.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Dust_Devil.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Pathfinder.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Scout.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Ethereal_Ghost.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Ethereal_Nightgaunt.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/Ethereal_Shadow.cfg
@@ -2061,6 +2334,7 @@ share/wesnoth/data/core/images/attacks/druidstaff.png
 share/wesnoth/data/core/images/attacks/entangle.png
 share/wesnoth/data/core/images/attacks/faerie-fire.png
 share/wesnoth/data/core/images/attacks/fangs-animal.png
+share/wesnoth/data/core/images/attacks/fangs-snake.png
 share/wesnoth/data/core/images/attacks/fangs-spider.png
 share/wesnoth/data/core/images/attacks/fangs.png
 share/wesnoth/data/core/images/attacks/fire-breath-drake.png
@@ -2102,6 +2376,7 @@ share/wesnoth/data/core/images/attacks/pike.png
 share/wesnoth/data/core/images/attacks/pincers.png
 share/wesnoth/data/core/images/attacks/pitchfork.png
 share/wesnoth/data/core/images/attacks/quarterstaff.png
+share/wesnoth/data/core/images/attacks/ram.png
 share/wesnoth/data/core/images/attacks/rectangular-shield.png
 share/wesnoth/data/core/images/attacks/rock_thrown.png
 share/wesnoth/data/core/images/attacks/saber-human.png
@@ -2133,6 +2408,8 @@ share/wesnoth/data/core/images/attacks/touch-undead.png
 share/wesnoth/data/core/images/attacks/touch-zombie.png
 share/wesnoth/data/core/images/attacks/trident.png
 share/wesnoth/data/core/images/attacks/wail.png
+share/wesnoth/data/core/images/attacks/warblade-red.png
+share/wesnoth/data/core/images/attacks/warblade.png
 share/wesnoth/data/core/images/attacks/waterspray.png
 share/wesnoth/data/core/images/attacks/web.png
 share/wesnoth/data/core/images/attacks/whip.png
@@ -2228,15 +2505,10 @@ share/wesnoth/data/core/images/halo/lightning-bolt-3-2.png
 share/wesnoth/data/core/images/halo/lightning-bolt-3-3.png
 share/wesnoth/data/core/images/halo/lightning-bolt-3-4.png
 share/wesnoth/data/core/images/halo/mage-halo1.png
-share/wesnoth/data/core/images/halo/mage-halo2-big.png
 share/wesnoth/data/core/images/halo/mage-halo2.png
-share/wesnoth/data/core/images/halo/mage-halo3-big.png
 share/wesnoth/data/core/images/halo/mage-halo3.png
-share/wesnoth/data/core/images/halo/mage-halo4-big.png
 share/wesnoth/data/core/images/halo/mage-halo4.png
-share/wesnoth/data/core/images/halo/mage-halo5-big.png
 share/wesnoth/data/core/images/halo/mage-halo5.png
-share/wesnoth/data/core/images/halo/mage-halo6-big.png
 share/wesnoth/data/core/images/halo/mage-preparation-halo1.png
 share/wesnoth/data/core/images/halo/mage-preparation-halo2.png
 share/wesnoth/data/core/images/halo/mage-preparation-halo3.png
@@ -2289,6 +2561,38 @@ share/wesnoth/data/core/images/help/closed_section.png
 share/wesnoth/data/core/images/help/hp-bars.png
 share/wesnoth/data/core/images/help/hpxp.png
 share/wesnoth/data/core/images/help/indentation.png
+share/wesnoth/data/core/images/help/l10n/de/hpxp.png
+share/wesnoth/data/core/images/help/l10n/de/recruit.png
+share/wesnoth/data/core/images/help/l10n/de/tooltip.png
+share/wesnoth/data/core/images/help/l10n/es/hpxp.png
+share/wesnoth/data/core/images/help/l10n/es/recruit.png
+share/wesnoth/data/core/images/help/l10n/es/tooltip.png
+share/wesnoth/data/core/images/help/l10n/fr/hpxp.png
+share/wesnoth/data/core/images/help/l10n/fr/recruit.png
+share/wesnoth/data/core/images/help/l10n/fr/tooltip.png
+share/wesnoth/data/core/images/help/l10n/hu/hpxp.png
+share/wesnoth/data/core/images/help/l10n/hu/recruit.png
+share/wesnoth/data/core/images/help/l10n/hu/tooltip.png
+share/wesnoth/data/core/images/help/l10n/it/hpxp.png
+share/wesnoth/data/core/images/help/l10n/it/recruit.png
+share/wesnoth/data/core/images/help/l10n/it/tooltip.png
+share/wesnoth/data/core/images/help/l10n/lt/hpxp.png
+share/wesnoth/data/core/images/help/l10n/lt/recruit.png
+share/wesnoth/data/core/images/help/l10n/lt/tooltip.png
+share/wesnoth/data/core/images/help/l10n/ru/hpxp.png
+share/wesnoth/data/core/images/help/l10n/ru/recruit.png
+share/wesnoth/data/core/images/help/l10n/ru/tooltip.png
+share/wesnoth/data/core/images/help/l10n/sr/hpxp.png
+share/wesnoth/data/core/images/help/l10n/sr/recruit.png
+share/wesnoth/data/core/images/help/l10n/sr/tooltip.png
+share/wesnoth/data/core/images/help/l10n/sr@ijekavian/recruit.png
+share/wesnoth/data/core/images/help/l10n/sr@ijekavianlatin/recruit.png
+share/wesnoth/data/core/images/help/l10n/sr@latin/hpxp.png
+share/wesnoth/data/core/images/help/l10n/sr@latin/recruit.png
+share/wesnoth/data/core/images/help/l10n/sr@latin/tooltip.png
+share/wesnoth/data/core/images/help/l10n/zh_CN/hpxp.png
+share/wesnoth/data/core/images/help/l10n/zh_CN/recruit.png
+share/wesnoth/data/core/images/help/l10n/zh_CN/tooltip.png
 share/wesnoth/data/core/images/help/moving1.png
 share/wesnoth/data/core/images/help/moving2.png
 share/wesnoth/data/core/images/help/open_section.png
@@ -2300,6 +2604,36 @@ share/wesnoth/data/core/images/help/orb-yellow.png
 share/wesnoth/data/core/images/help/recruit.png
 share/wesnoth/data/core/images/help/tooltip.png
 share/wesnoth/data/core/images/help/topic.png
+share/wesnoth/data/core/images/icons/boots_elven.png
+share/wesnoth/data/core/images/icons/breastplate.png
+share/wesnoth/data/core/images/icons/circlet_winged.png
+share/wesnoth/data/core/images/icons/cloak_leather_brown.png
+share/wesnoth/data/core/images/icons/coins_copper.png
+share/wesnoth/data/core/images/icons/crossed_sword_and_hammer.png
+share/wesnoth/data/core/images/icons/cuirass_leather_studded.png
+share/wesnoth/data/core/images/icons/cuirass_muscled.png
+share/wesnoth/data/core/images/icons/dress_silk_green.png
+share/wesnoth/data/core/images/icons/greaves.png
+share/wesnoth/data/core/images/icons/helmet_bascinet.png
+share/wesnoth/data/core/images/icons/helmet_conical.png
+share/wesnoth/data/core/images/icons/helmet_corinthian.png
+share/wesnoth/data/core/images/icons/helmet_crested.png
+share/wesnoth/data/core/images/icons/helmet_shiny.png
+share/wesnoth/data/core/images/icons/instrument_kantele.png
+share/wesnoth/data/core/images/icons/jewelry_butterfly_pin.png
+share/wesnoth/data/core/images/icons/jewelry_necklace_amber.png
+share/wesnoth/data/core/images/icons/jewelry_ring_prismatic.png
+share/wesnoth/data/core/images/icons/letter_and_ale.png
+share/wesnoth/data/core/images/icons/potion_green_medium.png
+share/wesnoth/data/core/images/icons/potion_green_small.png
+share/wesnoth/data/core/images/icons/potion_red_medium.png
+share/wesnoth/data/core/images/icons/potion_red_small.png
+share/wesnoth/data/core/images/icons/sandals.png
+share/wesnoth/data/core/images/icons/scroll_red.png
+share/wesnoth/data/core/images/icons/shield_tower.png
+share/wesnoth/data/core/images/icons/shield_tower_merfolk.png
+share/wesnoth/data/core/images/icons/shield_wooden.png
+share/wesnoth/data/core/images/icons/stone_ring.png
 share/wesnoth/data/core/images/items/altar-evil.png
 share/wesnoth/data/core/images/items/altar.png
 share/wesnoth/data/core/images/items/ankh-necklace.png
@@ -2354,6 +2688,8 @@ share/wesnoth/data/core/images/items/gold-coins-small.png
 share/wesnoth/data/core/images/items/grain-sheaf.png
 share/wesnoth/data/core/images/items/hammer-runic.png
 share/wesnoth/data/core/images/items/holy-water.png
+share/wesnoth/data/core/images/items/key.png
+share/wesnoth/data/core/images/items/leather-pack.png
 share/wesnoth/data/core/images/items/orcish-flag.png
 share/wesnoth/data/core/images/items/ornate1.png
 share/wesnoth/data/core/images/items/ornate2.png
@@ -2378,7 +2714,42 @@ share/wesnoth/data/core/images/items/storm-trident.png
 share/wesnoth/data/core/images/items/straw-bale1.png
 share/wesnoth/data/core/images/items/straw-bale2.png
 share/wesnoth/data/core/images/items/sword.png
+share/wesnoth/data/core/images/lobby/group-expanded.png
+share/wesnoth/data/core/images/lobby/group-folded.png
+share/wesnoth/data/core/images/lobby/l10n/sr/sort-az-off.png
+share/wesnoth/data/core/images/lobby/l10n/sr/sort-az.png
+share/wesnoth/data/core/images/lobby/sort-az-off.png
+share/wesnoth/data/core/images/lobby/sort-az.png
+share/wesnoth/data/core/images/lobby/sort-friend-off.png
+share/wesnoth/data/core/images/lobby/sort-friend.png
+share/wesnoth/data/core/images/lobby/status-idle-f.png
+share/wesnoth/data/core/images/lobby/status-idle-i.png
+share/wesnoth/data/core/images/lobby/status-idle-n.png
+share/wesnoth/data/core/images/lobby/status-idle-s.png
+share/wesnoth/data/core/images/lobby/status-lobby-f.png
+share/wesnoth/data/core/images/lobby/status-lobby-i.png
+share/wesnoth/data/core/images/lobby/status-lobby-n.png
+share/wesnoth/data/core/images/lobby/status-lobby-s.png
+share/wesnoth/data/core/images/lobby/status-obs-f.png
+share/wesnoth/data/core/images/lobby/status-obs-i.png
+share/wesnoth/data/core/images/lobby/status-obs-n.png
+share/wesnoth/data/core/images/lobby/status-playing-f.png
+share/wesnoth/data/core/images/lobby/status-playing-i.png
+share/wesnoth/data/core/images/lobby/status-playing-n.png
 share/wesnoth/data/core/images/maps/EDITING-HOWTO
+share/wesnoth/data/core/images/maps/l10n/de/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/es/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/fr/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/hu/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/it/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/la/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/lt/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/ru/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/sr/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/sr@ijekavian/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/sr@ijekavianlatin/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/sr@latin/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/zh_CN/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/wesnoth.png
 share/wesnoth/data/core/images/misc/blank-hex.png
 share/wesnoth/data/core/images/misc/cross-white.png
@@ -2388,9 +2759,23 @@ share/wesnoth/data/core/images/misc/flag-red.png
 share/wesnoth/data/core/images/misc/flag-white.png
 share/wesnoth/data/core/images/misc/hero-icon.png
 share/wesnoth/data/core/images/misc/icon-amla-tough.png
+share/wesnoth/data/core/images/misc/key.png
+share/wesnoth/data/core/images/misc/l10n/en@shaw/logo.png
+share/wesnoth/data/core/images/misc/l10n/es/logo.png
+share/wesnoth/data/core/images/misc/l10n/hu/logo.png
+share/wesnoth/data/core/images/misc/l10n/la/logo.png
+share/wesnoth/data/core/images/misc/l10n/lt/logo.png
+share/wesnoth/data/core/images/misc/l10n/sr/logo.png
+share/wesnoth/data/core/images/misc/l10n/sr@latin/logo.png
+share/wesnoth/data/core/images/misc/l10n/zh_CN/logo.png
+share/wesnoth/data/core/images/misc/laurel.png
 share/wesnoth/data/core/images/misc/logo.png
+share/wesnoth/data/core/images/misc/loyal-icon.png
 share/wesnoth/data/core/images/misc/new-battle.png
 share/wesnoth/data/core/images/misc/new-journey.png
+share/wesnoth/data/core/images/misc/qmark.png
+share/wesnoth/data/core/images/misc/red-x.png
+share/wesnoth/data/core/images/misc/reloaded.png
 share/wesnoth/data/core/images/misc/schedule-afternoon.png
 share/wesnoth/data/core/images/misc/schedule-dawn.png
 share/wesnoth/data/core/images/misc/schedule-dusk.png
@@ -2400,6 +2785,11 @@ share/wesnoth/data/core/images/misc/schedule-secondwatch.png
 share/wesnoth/data/core/images/misc/schedule-underground-illum.png
 share/wesnoth/data/core/images/misc/schedule-underground.png
 share/wesnoth/data/core/images/misc/tod-schedule-24hrs.png
+share/wesnoth/data/core/images/misc/ums.png
+share/wesnoth/data/core/images/misc/vision-fog-shroud.png
+share/wesnoth/data/core/images/misc/vision-fog.png
+share/wesnoth/data/core/images/misc/vision-none.png
+share/wesnoth/data/core/images/misc/vision-shroud.png
 share/wesnoth/data/core/images/portraits/ARTISTS
 share/wesnoth/data/core/images/portraits/drakes/burner.png
 share/wesnoth/data/core/images/portraits/drakes/clasher.png
@@ -2410,20 +2800,24 @@ share/wesnoth/data/core/images/portraits/drakes/transparent/clasher.png
 share/wesnoth/data/core/images/portraits/drakes/transparent/fighter.png
 share/wesnoth/data/core/images/portraits/drakes/transparent/glider.png
 share/wesnoth/data/core/images/portraits/dwarves/dragonguard.png
+share/wesnoth/data/core/images/portraits/dwarves/explorer.png
 share/wesnoth/data/core/images/portraits/dwarves/fighter.png
 share/wesnoth/data/core/images/portraits/dwarves/gryphon-rider.png
 share/wesnoth/data/core/images/portraits/dwarves/guard.png
 share/wesnoth/data/core/images/portraits/dwarves/lord.png
 share/wesnoth/data/core/images/portraits/dwarves/runemaster.png
+share/wesnoth/data/core/images/portraits/dwarves/scout.png
 share/wesnoth/data/core/images/portraits/dwarves/sentinel.png
 share/wesnoth/data/core/images/portraits/dwarves/thunderer.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/dragonguard.png
+share/wesnoth/data/core/images/portraits/dwarves/transparent/explorer.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/fighter-2.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/fighter.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/gryphon-rider.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/guard.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/lord.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/runemaster.png
+share/wesnoth/data/core/images/portraits/dwarves/transparent/scout.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/sentinel.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/thunderer.png
 share/wesnoth/data/core/images/portraits/dwarves/transparent/ulfserker.png
@@ -2464,20 +2858,35 @@ share/wesnoth/data/core/images/portraits/elves/transparent/shaman.png
 share/wesnoth/data/core/images/portraits/elves/transparent/shyde.png
 share/wesnoth/data/core/images/portraits/elves/transparent/sorceress.png
 share/wesnoth/data/core/images/portraits/elves/transparent/sylph.png
+share/wesnoth/data/core/images/portraits/goblins/direwolver.png
+share/wesnoth/data/core/images/portraits/goblins/impaler.png
+share/wesnoth/data/core/images/portraits/goblins/pillager.png
+share/wesnoth/data/core/images/portraits/goblins/rouser.png
 share/wesnoth/data/core/images/portraits/goblins/spearman.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/direwolver.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/impaler.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/pillager.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/rouser-2.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/rouser.png
 share/wesnoth/data/core/images/portraits/goblins/transparent/spearman.png
+share/wesnoth/data/core/images/portraits/goblins/transparent/wolf-rider.png
+share/wesnoth/data/core/images/portraits/goblins/wolf-rider.png
 share/wesnoth/data/core/images/portraits/humans/assassin+female.png
 share/wesnoth/data/core/images/portraits/humans/assassin.png
 share/wesnoth/data/core/images/portraits/humans/bandit.png
 share/wesnoth/data/core/images/portraits/humans/bowman.png
+share/wesnoth/data/core/images/portraits/humans/cavalier.png
 share/wesnoth/data/core/images/portraits/humans/cavalryman.png
 share/wesnoth/data/core/images/portraits/humans/dark-adept+female.png
 share/wesnoth/data/core/images/portraits/humans/dark-adept.png
+share/wesnoth/data/core/images/portraits/humans/duelist.png
+share/wesnoth/data/core/images/portraits/humans/fencer.png
+share/wesnoth/data/core/images/portraits/humans/footpad+female.png
+share/wesnoth/data/core/images/portraits/humans/footpad.png
 share/wesnoth/data/core/images/portraits/humans/general.png
 share/wesnoth/data/core/images/portraits/humans/grand-knight.png
 share/wesnoth/data/core/images/portraits/humans/halberdier.png
 share/wesnoth/data/core/images/portraits/humans/heavy-infantry.png
-share/wesnoth/data/core/images/portraits/humans/highwayman.png
 share/wesnoth/data/core/images/portraits/humans/horseman.png
 share/wesnoth/data/core/images/portraits/humans/huntsman.png
 share/wesnoth/data/core/images/portraits/humans/iron-mauler.png
@@ -2499,15 +2908,18 @@ share/wesnoth/data/core/images/portraits/humans/mage-white+female.png
 share/wesnoth/data/core/images/portraits/humans/mage-white.png
 share/wesnoth/data/core/images/portraits/humans/mage.png
 share/wesnoth/data/core/images/portraits/humans/marshal.png
+share/wesnoth/data/core/images/portraits/humans/master-at-arms.png
 share/wesnoth/data/core/images/portraits/humans/master-bowman.png
 share/wesnoth/data/core/images/portraits/humans/necromancer+female.png
 share/wesnoth/data/core/images/portraits/humans/necromancer.png
+share/wesnoth/data/core/images/portraits/humans/outlaw+female.png
+share/wesnoth/data/core/images/portraits/humans/outlaw.png
 share/wesnoth/data/core/images/portraits/humans/paladin.png
 share/wesnoth/data/core/images/portraits/humans/peasant.png
 share/wesnoth/data/core/images/portraits/humans/pikeman.png
-share/wesnoth/data/core/images/portraits/humans/poacher.png
 share/wesnoth/data/core/images/portraits/humans/ranger.png
 share/wesnoth/data/core/images/portraits/humans/royal-guard.png
+share/wesnoth/data/core/images/portraits/humans/ruffian.png
 share/wesnoth/data/core/images/portraits/humans/sergeant.png
 share/wesnoth/data/core/images/portraits/humans/spearman.png
 share/wesnoth/data/core/images/portraits/humans/swordsman.png
@@ -2516,15 +2928,27 @@ share/wesnoth/data/core/images/portraits/humans/thief.png
 share/wesnoth/data/core/images/portraits/humans/thug.png
 share/wesnoth/data/core/images/portraits/humans/transparent/assassin+female.png
 share/wesnoth/data/core/images/portraits/humans/transparent/assassin.png
+share/wesnoth/data/core/images/portraits/humans/transparent/bandit.png
 share/wesnoth/data/core/images/portraits/humans/transparent/bowman.png
+share/wesnoth/data/core/images/portraits/humans/transparent/cavalier.png
+share/wesnoth/data/core/images/portraits/humans/transparent/cavalryman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/dark-adept+female.png
 share/wesnoth/data/core/images/portraits/humans/transparent/dark-adept.png
+share/wesnoth/data/core/images/portraits/humans/transparent/duelist.png
+share/wesnoth/data/core/images/portraits/humans/transparent/fencer.png
+share/wesnoth/data/core/images/portraits/humans/transparent/footpad+female.png
+share/wesnoth/data/core/images/portraits/humans/transparent/footpad.png
 share/wesnoth/data/core/images/portraits/humans/transparent/general.png
+share/wesnoth/data/core/images/portraits/humans/transparent/grand-knight-2.png
+share/wesnoth/data/core/images/portraits/humans/transparent/grand-knight.png
 share/wesnoth/data/core/images/portraits/humans/transparent/halberdier.png
 share/wesnoth/data/core/images/portraits/humans/transparent/heavy-infantry.png
+share/wesnoth/data/core/images/portraits/humans/transparent/horseman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/huntsman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/iron-mauler.png
 share/wesnoth/data/core/images/portraits/humans/transparent/javelineer.png
+share/wesnoth/data/core/images/portraits/humans/transparent/knight.png
+share/wesnoth/data/core/images/portraits/humans/transparent/lancer.png
 share/wesnoth/data/core/images/portraits/humans/transparent/lieutenant.png
 share/wesnoth/data/core/images/portraits/humans/transparent/longbowman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/mage+female.png
@@ -2541,56 +2965,99 @@ share/wesnoth/data/core/images/portraits/humans/transparent/mage-white.png
 share/wesnoth/data/core/images/portraits/humans/transparent/mage.png
 share/wesnoth/data/core/images/portraits/humans/transparent/marshal-2.png
 share/wesnoth/data/core/images/portraits/humans/transparent/marshal.png
+share/wesnoth/data/core/images/portraits/humans/transparent/master-at-arms.png
 share/wesnoth/data/core/images/portraits/humans/transparent/master-bowman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/necromancer+female.png
 share/wesnoth/data/core/images/portraits/humans/transparent/necromancer.png
+share/wesnoth/data/core/images/portraits/humans/transparent/outlaw+female.png
+share/wesnoth/data/core/images/portraits/humans/transparent/outlaw.png
+share/wesnoth/data/core/images/portraits/humans/transparent/paladin.png
 share/wesnoth/data/core/images/portraits/humans/transparent/peasant.png
 share/wesnoth/data/core/images/portraits/humans/transparent/pikeman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/ranger.png
 share/wesnoth/data/core/images/portraits/humans/transparent/royal-guard.png
+share/wesnoth/data/core/images/portraits/humans/transparent/ruffian.png
 share/wesnoth/data/core/images/portraits/humans/transparent/sergeant.png
 share/wesnoth/data/core/images/portraits/humans/transparent/spearman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/swordsman.png
 share/wesnoth/data/core/images/portraits/humans/transparent/thief+female.png
 share/wesnoth/data/core/images/portraits/humans/transparent/thief.png
+share/wesnoth/data/core/images/portraits/humans/transparent/thug.png
 share/wesnoth/data/core/images/portraits/humans/transparent/trapper.png
 share/wesnoth/data/core/images/portraits/humans/transparent/woodsman.png
 share/wesnoth/data/core/images/portraits/humans/trapper.png
 share/wesnoth/data/core/images/portraits/humans/woodsman.png
+share/wesnoth/data/core/images/portraits/merfolk/enchantress.png
 share/wesnoth/data/core/images/portraits/merfolk/fighter.png
+share/wesnoth/data/core/images/portraits/merfolk/hoplite.png
 share/wesnoth/data/core/images/portraits/merfolk/hunter.png
 share/wesnoth/data/core/images/portraits/merfolk/initiate.png
+share/wesnoth/data/core/images/portraits/merfolk/netcaster.png
+share/wesnoth/data/core/images/portraits/merfolk/priestess.png
+share/wesnoth/data/core/images/portraits/merfolk/spearman.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/enchantress.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/fighter.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/hoplite.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/hunter.png
 share/wesnoth/data/core/images/portraits/merfolk/transparent/initiate.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/netcaster.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/priestess.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/spearman.png
+share/wesnoth/data/core/images/portraits/merfolk/transparent/triton.png
+share/wesnoth/data/core/images/portraits/merfolk/triton.png
+share/wesnoth/data/core/images/portraits/monsters/bat.png
 share/wesnoth/data/core/images/portraits/monsters/gryphon.png
 share/wesnoth/data/core/images/portraits/monsters/ogre.png
 share/wesnoth/data/core/images/portraits/monsters/scorpion.png
 share/wesnoth/data/core/images/portraits/monsters/sea-serpent.png
+share/wesnoth/data/core/images/portraits/monsters/transparent/bat.png
 share/wesnoth/data/core/images/portraits/monsters/transparent/gryphon.png
 share/wesnoth/data/core/images/portraits/monsters/transparent/ogre.png
 share/wesnoth/data/core/images/portraits/monsters/transparent/scorpion.png
-share/wesnoth/data/core/images/portraits/nagas/fighter+female.png
 share/wesnoth/data/core/images/portraits/nagas/fighter.png
+share/wesnoth/data/core/images/portraits/nagas/myrmidon.png
+share/wesnoth/data/core/images/portraits/nagas/transparent/fighter.png
+share/wesnoth/data/core/images/portraits/nagas/transparent/myrmidon.png
 share/wesnoth/data/core/images/portraits/orcs/assassin.png
 share/wesnoth/data/core/images/portraits/orcs/grunt.png
+share/wesnoth/data/core/images/portraits/orcs/transparent/assassin.png
+share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-2.png
+share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-3.png
 share/wesnoth/data/core/images/portraits/orcs/transparent/grunt.png
+share/wesnoth/data/core/images/portraits/orcs/transparent/warlord.png
+share/wesnoth/data/core/images/portraits/orcs/transparent/warrior.png
 share/wesnoth/data/core/images/portraits/orcs/warlord.png
-share/wesnoth/data/core/images/portraits/orcs/warlord2.png
-share/wesnoth/data/core/images/portraits/orcs/warlord3.png
-share/wesnoth/data/core/images/portraits/orcs/warlord4.png
-share/wesnoth/data/core/images/portraits/orcs/warlord5.png
+share/wesnoth/data/core/images/portraits/orcs/warrior.png
 share/wesnoth/data/core/images/portraits/saurians/augur.png
 share/wesnoth/data/core/images/portraits/saurians/skirmisher.png
 share/wesnoth/data/core/images/portraits/saurians/transparent/augur.png
 share/wesnoth/data/core/images/portraits/saurians/transparent/skirmisher.png
+share/wesnoth/data/core/images/portraits/trolls/transparent/troll.png
 share/wesnoth/data/core/images/portraits/trolls/transparent/whelp.png
 share/wesnoth/data/core/images/portraits/trolls/troll.png
 share/wesnoth/data/core/images/portraits/trolls/whelp.png
 share/wesnoth/data/core/images/portraits/undead/brown-lich.png
 share/wesnoth/data/core/images/portraits/undead/death-knight.png
+share/wesnoth/data/core/images/portraits/undead/deathblade.png
+share/wesnoth/data/core/images/portraits/undead/ghost.png
 share/wesnoth/data/core/images/portraits/undead/ghoul.png
 share/wesnoth/data/core/images/portraits/undead/lich.png
+share/wesnoth/data/core/images/portraits/undead/nightgaunt.png
+share/wesnoth/data/core/images/portraits/undead/revenant.png
+share/wesnoth/data/core/images/portraits/undead/shadow.png
+share/wesnoth/data/core/images/portraits/undead/skeleton.png
+share/wesnoth/data/core/images/portraits/undead/spectre.png
 share/wesnoth/data/core/images/portraits/undead/transparent/death-knight.png
+share/wesnoth/data/core/images/portraits/undead/transparent/deathblade.png
+share/wesnoth/data/core/images/portraits/undead/transparent/ghost.png
 share/wesnoth/data/core/images/portraits/undead/transparent/lich.png
+share/wesnoth/data/core/images/portraits/undead/transparent/nightgaunt.png
+share/wesnoth/data/core/images/portraits/undead/transparent/revenant.png
+share/wesnoth/data/core/images/portraits/undead/transparent/shadow.png
+share/wesnoth/data/core/images/portraits/undead/transparent/skeleton.png
+share/wesnoth/data/core/images/portraits/undead/transparent/spectre.png
+share/wesnoth/data/core/images/portraits/woses/ancient-wose.png
+share/wesnoth/data/core/images/portraits/woses/transparent/ancient-wose.png
 share/wesnoth/data/core/images/projectiles/bolas-n.png
 share/wesnoth/data/core/images/projectiles/bolas-ne.png
 share/wesnoth/data/core/images/projectiles/bone-n.png
@@ -2876,6 +3343,7 @@ share/wesnoth/data/core/images/terrain/bridge-sw.png
 share/wesnoth/data/core/images/terrain/bridge-swamp-n-s-tile.png
 share/wesnoth/data/core/images/terrain/bridge-swamp-ne-sw-tile.png
 share/wesnoth/data/core/images/terrain/bridge-swamp-se-nw-tile.png
+share/wesnoth/data/core/images/terrain/castle-overlay-editor.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-l.png
@@ -2959,6 +3427,7 @@ share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-ccw-l.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-ccw-r.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-ccw-tl.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-concave-tr.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-convex-bl.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-convex-br.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep-castle-convex-l.png
@@ -3007,6 +3476,7 @@ share/wesnoth/data/core/images/terrain/castle/keep-castle-ccw-l.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-ccw-r.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-ccw-tl.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/keep-castle-concave-tr.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-convex-bl.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-convex-br.png
 share/wesnoth/data/core/images/terrain/castle/keep-castle-convex-l.png
@@ -3032,6 +3502,52 @@ share/wesnoth/data/core/images/terrain/castle/keep-convex-r.png
 share/wesnoth/data/core/images/terrain/castle/keep-convex-tl.png
 share/wesnoth/data/core/images/terrain/castle/keep-convex-tr.png
 share/wesnoth/data/core/images/terrain/castle/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/fort-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/ground.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-bl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-br.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-l.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-r.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-tl.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-fort-cw-tr.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/orcish/keep.png
+share/wesnoth/data/core/images/terrain/castle/orcish/tile.png
 share/wesnoth/data/core/images/terrain/castle/ruin-tile.png
 share/wesnoth/data/core/images/terrain/castle/ruin1-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/ruin1-concave-br.png
@@ -3243,6 +3759,7 @@ share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-ccw-l.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-ccw-r.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-ccw-tl.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-concave-tr.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-convex-bl.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-convex-br.png
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-castle-convex-l.png
@@ -3704,36 +4221,36 @@ share/wesnoth/data/core/images/terrain/fog-sw.png
 share/wesnoth/data/core/images/terrain/fog.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-3.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-fall-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-fall-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-sparse-3.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-fall-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-fall-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-sparse.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall-tile.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-fall.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-3.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-4.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-summer-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-summer-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-sparse-3.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-summer-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-summer-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-sparse.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer-tile.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-summer.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-2.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-winter-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-winter-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-2.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-sparse-3.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-sparse.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow-tile.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-snow.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-sparse-3.png
-share/wesnoth/data/core/images/terrain/forest/deciduous-winter-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/deciduous-winter-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-sparse.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter-tile.png
 share/wesnoth/data/core/images/terrain/forest/deciduous-winter.png
@@ -3781,30 +4298,30 @@ share/wesnoth/data/core/images/terrain/forest/great-tree1.png
 share/wesnoth/data/core/images/terrain/forest/great-tree2.png
 share/wesnoth/data/core/images/terrain/forest/great-tree3.png
 share/wesnoth/data/core/images/terrain/forest/mixed-fall-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-fall-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-fall-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-fall-sparse-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-fall-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-fall-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-fall-sparse.png
 share/wesnoth/data/core/images/terrain/forest/mixed-fall-tile.png
 share/wesnoth/data/core/images/terrain/forest/mixed-fall.png
 share/wesnoth/data/core/images/terrain/forest/mixed-summer-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-summer-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-summer-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-summer-sparse-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-summer-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-summer-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-summer-sparse.png
 share/wesnoth/data/core/images/terrain/forest/mixed-summer-tile.png
 share/wesnoth/data/core/images/terrain/forest/mixed-summer.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-winter-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-winter-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-sparse-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-sparse.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow-tile.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-snow.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-sparse-2.png
-share/wesnoth/data/core/images/terrain/forest/mixed-winter-sparse-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/mixed-winter-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-sparse.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter-tile.png
 share/wesnoth/data/core/images/terrain/forest/mixed-winter.png
@@ -3825,49 +4342,30 @@ share/wesnoth/data/core/images/terrain/forest/mushrooms.png
 share/wesnoth/data/core/images/terrain/forest/pine-2.png
 share/wesnoth/data/core/images/terrain/forest/pine-3.png
 share/wesnoth/data/core/images/terrain/forest/pine-4.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-n.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-ne.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-nw.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-s.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-se.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-small.png
-share/wesnoth/data/core/images/terrain/forest/pine-castle-sw.png
 share/wesnoth/data/core/images/terrain/forest/pine-small-2.png
 share/wesnoth/data/core/images/terrain/forest/pine-small.png
 share/wesnoth/data/core/images/terrain/forest/pine-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/pine-sparse-3.png
 share/wesnoth/data/core/images/terrain/forest/pine-sparse-4.png
+share/wesnoth/data/core/images/terrain/forest/pine-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/pine-sparse.png
 share/wesnoth/data/core/images/terrain/forest/pine-tile.png
 share/wesnoth/data/core/images/terrain/forest/pine.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-2.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-3.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-4.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-n-ne.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-n.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-ne.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-nw-n-ne.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-nw-n.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-nw.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-s.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-se.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-small.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-sw-nw.png
-share/wesnoth/data/core/images/terrain/forest/snow-forest-castle-sw.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-small.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-sparse-2.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-sparse-3.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-sparse-4.png
+share/wesnoth/data/core/images/terrain/forest/snow-forest-sparse-small.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-sparse.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest-tile.png
 share/wesnoth/data/core/images/terrain/forest/snow-forest.png
 share/wesnoth/data/core/images/terrain/forest/tropical-2.png
 share/wesnoth/data/core/images/terrain/forest/tropical-3.png
 share/wesnoth/data/core/images/terrain/forest/tropical-4.png
-share/wesnoth/data/core/images/terrain/forest/tropical-castle-n.png
-share/wesnoth/data/core/images/terrain/forest/tropical-castle-ne.png
-share/wesnoth/data/core/images/terrain/forest/tropical-castle-nw.png
-share/wesnoth/data/core/images/terrain/forest/tropical-castle-small.png
+share/wesnoth/data/core/images/terrain/forest/tropical-small.png
 share/wesnoth/data/core/images/terrain/forest/tropical-tile.png
 share/wesnoth/data/core/images/terrain/forest/tropical.png
 share/wesnoth/data/core/images/terrain/forested-deciduous-fall-hills-tile.png
@@ -3931,6 +4429,7 @@ share/wesnoth/data/core/images/terrain/ice4.png
 share/wesnoth/data/core/images/terrain/ice5.png
 share/wesnoth/data/core/images/terrain/ice6.png
 share/wesnoth/data/core/images/terrain/impassable-editor.png
+share/wesnoth/data/core/images/terrain/keep-overlay-editor.png
 share/wesnoth/data/core/images/terrain/lava-chasm-ccw-bl.png
 share/wesnoth/data/core/images/terrain/lava-chasm-ccw-br.png
 share/wesnoth/data/core/images/terrain/lava-chasm-ccw-l.png
@@ -3968,19 +4467,21 @@ share/wesnoth/data/core/images/terrain/lava-convex-l.png
 share/wesnoth/data/core/images/terrain/lava-convex-r.png
 share/wesnoth/data/core/images/terrain/lava-convex-tl.png
 share/wesnoth/data/core/images/terrain/lava-convex-tr.png
-share/wesnoth/data/core/images/terrain/lava-n-ne-nw-s.png
-share/wesnoth/data/core/images/terrain/lava-n-ne-nw.png
+share/wesnoth/data/core/images/terrain/lava-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/lava-n-ne-se.png
 share/wesnoth/data/core/images/terrain/lava-n-ne.png
 share/wesnoth/data/core/images/terrain/lava-n.png
-share/wesnoth/data/core/images/terrain/lava-ne-nw-s.png
+share/wesnoth/data/core/images/terrain/lava-ne-se-s.png
 share/wesnoth/data/core/images/terrain/lava-ne-se.png
 share/wesnoth/data/core/images/terrain/lava-ne.png
+share/wesnoth/data/core/images/terrain/lava-nw-n-ne.png
 share/wesnoth/data/core/images/terrain/lava-nw-n.png
 share/wesnoth/data/core/images/terrain/lava-nw.png
-share/wesnoth/data/core/images/terrain/lava-s-nw-ne-n.png
+share/wesnoth/data/core/images/terrain/lava-s-sw-nw-n.png
 share/wesnoth/data/core/images/terrain/lava-s-sw-nw.png
 share/wesnoth/data/core/images/terrain/lava-s-sw.png
 share/wesnoth/data/core/images/terrain/lava-s.png
+share/wesnoth/data/core/images/terrain/lava-se-s-sw.png
 share/wesnoth/data/core/images/terrain/lava-se-s.png
 share/wesnoth/data/core/images/terrain/lava-se.png
 share/wesnoth/data/core/images/terrain/lava-sw-nw-n.png
@@ -4190,6 +4691,7 @@ share/wesnoth/data/core/images/terrain/snow-to-water-sw-nw.png
 share/wesnoth/data/core/images/terrain/snow-to-water-sw.png
 share/wesnoth/data/core/images/terrain/snow.png
 share/wesnoth/data/core/images/terrain/snow2.png
+share/wesnoth/data/core/images/terrain/stars/blue.png
 share/wesnoth/data/core/images/terrain/stars/blue1.png
 share/wesnoth/data/core/images/terrain/stars/blue2.png
 share/wesnoth/data/core/images/terrain/stars/blue3.png
@@ -4265,6 +4767,19 @@ share/wesnoth/data/core/images/terrain/village/desert-tile.png
 share/wesnoth/data/core/images/terrain/village/desert.png
 share/wesnoth/data/core/images/terrain/village/desert2.png
 share/wesnoth/data/core/images/terrain/village/desert3.png
+share/wesnoth/data/core/images/terrain/village/drake-tile.png
+share/wesnoth/data/core/images/terrain/village/drake1-1.png
+share/wesnoth/data/core/images/terrain/village/drake1-2.png
+share/wesnoth/data/core/images/terrain/village/drake1-3.png
+share/wesnoth/data/core/images/terrain/village/drake1.png
+share/wesnoth/data/core/images/terrain/village/drake2-1.png
+share/wesnoth/data/core/images/terrain/village/drake2-2.png
+share/wesnoth/data/core/images/terrain/village/drake2-3.png
+share/wesnoth/data/core/images/terrain/village/drake2-4.png
+share/wesnoth/data/core/images/terrain/village/drake2.png
+share/wesnoth/data/core/images/terrain/village/drake3.png
+share/wesnoth/data/core/images/terrain/village/drake4.png
+share/wesnoth/data/core/images/terrain/village/drake5.png
 share/wesnoth/data/core/images/terrain/village/dwarven-tile.png
 share/wesnoth/data/core/images/terrain/village/dwarven.png
 share/wesnoth/data/core/images/terrain/village/dwarven2.png
@@ -4308,6 +4823,22 @@ share/wesnoth/data/core/images/terrain/village/hut-snow2.png
 share/wesnoth/data/core/images/terrain/village/hut-tile.png
 share/wesnoth/data/core/images/terrain/village/hut.png
 share/wesnoth/data/core/images/terrain/village/hut2.png
+share/wesnoth/data/core/images/terrain/village/log-cabin-snow-tile.png
+share/wesnoth/data/core/images/terrain/village/log-cabin-snow.png
+share/wesnoth/data/core/images/terrain/village/log-cabin-tile.png
+share/wesnoth/data/core/images/terrain/village/log-cabin.png
+share/wesnoth/data/core/images/terrain/village/orc-hills-tile.png
+share/wesnoth/data/core/images/terrain/village/orc-snow-hills-tile.png
+share/wesnoth/data/core/images/terrain/village/orc-snow-tile.png
+share/wesnoth/data/core/images/terrain/village/orc-snow1.png
+share/wesnoth/data/core/images/terrain/village/orc-snow2.png
+share/wesnoth/data/core/images/terrain/village/orc-snow3.png
+share/wesnoth/data/core/images/terrain/village/orc-snow4.png
+share/wesnoth/data/core/images/terrain/village/orc-tile.png
+share/wesnoth/data/core/images/terrain/village/orc1.png
+share/wesnoth/data/core/images/terrain/village/orc2.png
+share/wesnoth/data/core/images/terrain/village/orc3.png
+share/wesnoth/data/core/images/terrain/village/orc4.png
 share/wesnoth/data/core/images/terrain/village/snow-tile.png
 share/wesnoth/data/core/images/terrain/village/swamp-merfolk-tile.png
 share/wesnoth/data/core/images/terrain/village/swampwater-tile.png
@@ -4418,7 +4949,9 @@ share/wesnoth/data/core/images/terrain/windmill-17.png
 share/wesnoth/data/core/images/terrain/windmill-18.png
 share/wesnoth/data/core/images/terrain/windmill-tile.png
 share/wesnoth/data/core/images/themes/experimental-rightside.png
+share/wesnoth/data/core/images/themes/gold-t.png
 share/wesnoth/data/core/images/themes/gold.png
+share/wesnoth/data/core/images/themes/income-t.png
 share/wesnoth/data/core/images/themes/income.png
 share/wesnoth/data/core/images/themes/minimap.png
 share/wesnoth/data/core/images/themes/rightside-bg.png
@@ -4426,14 +4959,41 @@ share/wesnoth/data/core/images/themes/rightside-bottom.png
 share/wesnoth/data/core/images/themes/rightside-editor.png
 share/wesnoth/data/core/images/themes/rightside-small.png
 share/wesnoth/data/core/images/themes/rightside.png
+share/wesnoth/data/core/images/themes/sand-clock-t.png
 share/wesnoth/data/core/images/themes/sand-clock.png
 share/wesnoth/data/core/images/themes/status-bg.png
 share/wesnoth/data/core/images/themes/timeofday.png
 share/wesnoth/data/core/images/themes/top-bg.png
 share/wesnoth/data/core/images/themes/unit.png
+share/wesnoth/data/core/images/themes/units-t.png
 share/wesnoth/data/core/images/themes/units.png
+share/wesnoth/data/core/images/themes/upkeep-t.png
 share/wesnoth/data/core/images/themes/upkeep.png
 share/wesnoth/data/core/images/themes/villages.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-s-4.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-s-5.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-s-6.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-1.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-2.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-3.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-4.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-5.png
+share/wesnoth/data/core/images/units/drakes/arbiter-blade-se-6.png
+share/wesnoth/data/core/images/units/drakes/arbiter-defend-1.png
+share/wesnoth/data/core/images/units/drakes/arbiter-defend-2.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-s-3.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-s-4.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-s-5.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-s-6.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-s-7.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-1.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-2.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-3.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-4.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-5.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-6.png
+share/wesnoth/data/core/images/units/drakes/arbiter-pierce-se-7.png
+share/wesnoth/data/core/images/units/drakes/arbiter.png
 share/wesnoth/data/core/images/units/drakes/armageddon-attack-melee1.png
 share/wesnoth/data/core/images/units/drakes/armageddon-attack-melee2.png
 share/wesnoth/data/core/images/units/drakes/armageddon-attack-melee3.png
@@ -4450,218 +5010,380 @@ share/wesnoth/data/core/images/units/drakes/armageddon-die5.png
 share/wesnoth/data/core/images/units/drakes/armageddon-die6.png
 share/wesnoth/data/core/images/units/drakes/armageddon-flying.png
 share/wesnoth/data/core/images/units/drakes/armageddon.png
-share/wesnoth/data/core/images/units/drakes/blademaster-attack-close1.png
-share/wesnoth/data/core/images/units/drakes/blademaster-attack-close2.png
-share/wesnoth/data/core/images/units/drakes/blademaster-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/blademaster-defend.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-1.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-2.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-3.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-4.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-5.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-6.png
-share/wesnoth/data/core/images/units/drakes/blademaster-die-7.png
-share/wesnoth/data/core/images/units/drakes/blademaster-flying.png
+share/wesnoth/data/core/images/units/drakes/blademaster-defend-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-defend-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-4.png
+share/wesnoth/data/core/images/units/drakes/blademaster-fly-5.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-4.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-5.png
+share/wesnoth/data/core/images/units/drakes/blademaster-melee-6.png
+share/wesnoth/data/core/images/units/drakes/blademaster-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/blademaster-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/blademaster-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/blademaster-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/blademaster.png
-share/wesnoth/data/core/images/units/drakes/burner-attack-close.png
-share/wesnoth/data/core/images/units/drakes/burner-attack-ranged1.png
-share/wesnoth/data/core/images/units/drakes/burner-attack-ranged2.png
-share/wesnoth/data/core/images/units/drakes/burner-defend.png
-share/wesnoth/data/core/images/units/drakes/burner-die-1.png
-share/wesnoth/data/core/images/units/drakes/burner-die-2.png
-share/wesnoth/data/core/images/units/drakes/burner-die-3.png
-share/wesnoth/data/core/images/units/drakes/burner-die-4.png
-share/wesnoth/data/core/images/units/drakes/burner-die-5.png
-share/wesnoth/data/core/images/units/drakes/burner-die-6.png
-share/wesnoth/data/core/images/units/drakes/burner-flying.png
+share/wesnoth/data/core/images/units/drakes/burner-defend-1.png
+share/wesnoth/data/core/images/units/drakes/burner-defend-2.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/burner-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-1.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-2.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-3.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-4.png
+share/wesnoth/data/core/images/units/drakes/burner-fly-5.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-1.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-2.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-3.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-4.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-5.png
+share/wesnoth/data/core/images/units/drakes/burner-melee-6.png
+share/wesnoth/data/core/images/units/drakes/burner-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/burner-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/burner-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/burner-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/burner.png
-share/wesnoth/data/core/images/units/drakes/clasher-attack-spear.png
-share/wesnoth/data/core/images/units/drakes/clasher-attack-sword.png
-share/wesnoth/data/core/images/units/drakes/clasher-defend.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-1.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-10.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-2.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-3.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-4.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-5.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-6.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-7.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-8.png
-share/wesnoth/data/core/images/units/drakes/clasher-die-9.png
-share/wesnoth/data/core/images/units/drakes/clasher-flying.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-1.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-2.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-3.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-4.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-5.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-6.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-defend-1.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade-defend-2.png
+share/wesnoth/data/core/images/units/drakes/clasher-blade.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-defend-1.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-defend-2.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-s-2.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-s-3.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-s-4.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-s-5.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-s-6.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-1.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-2.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-3.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-4.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-5.png
+share/wesnoth/data/core/images/units/drakes/clasher-spear-se-6.png
 share/wesnoth/data/core/images/units/drakes/clasher.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-1.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-2.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-3.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-4.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-5.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-6.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-7.png
-share/wesnoth/data/core/images/units/drakes/enforcer-die-8.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-1.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-3.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-4.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-5.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-6.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-defend-1.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade-defend-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-blade.png
+share/wesnoth/data/core/images/units/drakes/enforcer-impact-1.png
+share/wesnoth/data/core/images/units/drakes/enforcer-impact-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-impact-3.png
+share/wesnoth/data/core/images/units/drakes/enforcer-impact-4.png
+share/wesnoth/data/core/images/units/drakes/enforcer-impact-5.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-defend-1.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-defend-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-s-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-s-3.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-s-4.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-s-5.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-s-6.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-1.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-2.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-3.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-4.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-5.png
+share/wesnoth/data/core/images/units/drakes/enforcer-spear-se-6.png
 share/wesnoth/data/core/images/units/drakes/enforcer.png
-share/wesnoth/data/core/images/units/drakes/fighter-attack-close1.png
-share/wesnoth/data/core/images/units/drakes/fighter-attack-close2.png
-share/wesnoth/data/core/images/units/drakes/fighter-attack-ranged1.png
-share/wesnoth/data/core/images/units/drakes/fighter-attack-ranged2.png
-share/wesnoth/data/core/images/units/drakes/fighter-defend.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-1.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-2.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-3.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-4.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-5.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-6.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-7.png
-share/wesnoth/data/core/images/units/drakes/fighter-die-8.png
-share/wesnoth/data/core/images/units/drakes/fighter-flying.png
+share/wesnoth/data/core/images/units/drakes/fighter-defend-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-defend-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-4.png
+share/wesnoth/data/core/images/units/drakes/fighter-fly-5.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-4.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-5.png
+share/wesnoth/data/core/images/units/drakes/fighter-melee-6.png
+share/wesnoth/data/core/images/units/drakes/fighter-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/fighter-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/fighter-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/fighter-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/fighter.png
-share/wesnoth/data/core/images/units/drakes/fire-attack-close.png
-share/wesnoth/data/core/images/units/drakes/fire-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/fire-defend.png
-share/wesnoth/data/core/images/units/drakes/fire-die-1.png
-share/wesnoth/data/core/images/units/drakes/fire-die-2.png
-share/wesnoth/data/core/images/units/drakes/fire-die-3.png
-share/wesnoth/data/core/images/units/drakes/fire-die-4.png
-share/wesnoth/data/core/images/units/drakes/fire-die-5.png
-share/wesnoth/data/core/images/units/drakes/fire-die-6.png
-share/wesnoth/data/core/images/units/drakes/fire-die-7.png
-share/wesnoth/data/core/images/units/drakes/fire-flying.png
+share/wesnoth/data/core/images/units/drakes/fire-defend-1.png
+share/wesnoth/data/core/images/units/drakes/fire-defend-2.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/fire-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-1.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-2.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-3.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-4.png
+share/wesnoth/data/core/images/units/drakes/fire-fly-5.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-1.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-2.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-3.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-4.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-5.png
+share/wesnoth/data/core/images/units/drakes/fire-melee-6.png
+share/wesnoth/data/core/images/units/drakes/fire-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/fire-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/fire-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/fire-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/fire.png
-share/wesnoth/data/core/images/units/drakes/flameheart-attack-close1.png
-share/wesnoth/data/core/images/units/drakes/flameheart-attack-close2.png
-share/wesnoth/data/core/images/units/drakes/flameheart-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/flameheart-defend.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-1.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-2.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-3.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-4.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-5.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-6.png
-share/wesnoth/data/core/images/units/drakes/flameheart-die-7.png
-share/wesnoth/data/core/images/units/drakes/flameheart-flying.png
-share/wesnoth/data/core/images/units/drakes/flameheart-lead.png
 share/wesnoth/data/core/images/units/drakes/flameheart.png
-share/wesnoth/data/core/images/units/drakes/flare-attack-close.png
-share/wesnoth/data/core/images/units/drakes/flare-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/flare-defend.png
-share/wesnoth/data/core/images/units/drakes/flare-die-1.png
-share/wesnoth/data/core/images/units/drakes/flare-die-2.png
-share/wesnoth/data/core/images/units/drakes/flare-die-3.png
-share/wesnoth/data/core/images/units/drakes/flare-die-4.png
-share/wesnoth/data/core/images/units/drakes/flare-die-5.png
-share/wesnoth/data/core/images/units/drakes/flare-die-6.png
-share/wesnoth/data/core/images/units/drakes/flare-die-7.png
-share/wesnoth/data/core/images/units/drakes/flare-die-8.png
-share/wesnoth/data/core/images/units/drakes/flare-flying.png
-share/wesnoth/data/core/images/units/drakes/flare-lead.png
 share/wesnoth/data/core/images/units/drakes/flare.png
-share/wesnoth/data/core/images/units/drakes/gladiator-attack-mace.png
-share/wesnoth/data/core/images/units/drakes/gladiator-attack-spear.png
-share/wesnoth/data/core/images/units/drakes/gladiator-attack-sword.png
-share/wesnoth/data/core/images/units/drakes/gladiator-defend.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-1.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-2.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-3.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-4.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-5.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-6.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-7.png
-share/wesnoth/data/core/images/units/drakes/gladiator-die-8.png
-share/wesnoth/data/core/images/units/drakes/gladiator-flying.png
-share/wesnoth/data/core/images/units/drakes/gladiator.png
-share/wesnoth/data/core/images/units/drakes/glider-attack-close1.png
-share/wesnoth/data/core/images/units/drakes/glider-attack-close2.png
-share/wesnoth/data/core/images/units/drakes/glider-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/glider-defend.png
-share/wesnoth/data/core/images/units/drakes/glider-die-1.png
-share/wesnoth/data/core/images/units/drakes/glider-die-2.png
-share/wesnoth/data/core/images/units/drakes/glider-die-3.png
-share/wesnoth/data/core/images/units/drakes/glider-die-4.png
-share/wesnoth/data/core/images/units/drakes/glider-die-5.png
-share/wesnoth/data/core/images/units/drakes/glider-die-6.png
-share/wesnoth/data/core/images/units/drakes/glider-die-7.png
-share/wesnoth/data/core/images/units/drakes/glider-die-8.png
-share/wesnoth/data/core/images/units/drakes/glider-flying.png
+share/wesnoth/data/core/images/units/drakes/glider-defend-1.png
+share/wesnoth/data/core/images/units/drakes/glider-defend-2.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/glider-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-1.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-2.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-3.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-4.png
+share/wesnoth/data/core/images/units/drakes/glider-fly-5.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-1.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-2.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-3.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-4.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-5.png
+share/wesnoth/data/core/images/units/drakes/glider-kick-6.png
+share/wesnoth/data/core/images/units/drakes/glider-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/glider-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/glider-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/glider-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/glider.png
-share/wesnoth/data/core/images/units/drakes/hurricane-attack-melee1.png
-share/wesnoth/data/core/images/units/drakes/hurricane-attack-melee2.png
-share/wesnoth/data/core/images/units/drakes/hurricane-attack-ranged-fire1.png
-share/wesnoth/data/core/images/units/drakes/hurricane-attack-ranged-fire2.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-1.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-2.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-3.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-4.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-5.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-6.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-7.png
-share/wesnoth/data/core/images/units/drakes/hurricane-die-8.png
-share/wesnoth/data/core/images/units/drakes/hurricane-flying.png
+share/wesnoth/data/core/images/units/drakes/hurricane-defend-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-defend-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-4.png
+share/wesnoth/data/core/images/units/drakes/hurricane-fly-5.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-4.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-5.png
+share/wesnoth/data/core/images/units/drakes/hurricane-kick-6.png
+share/wesnoth/data/core/images/units/drakes/hurricane-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/hurricane-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/hurricane-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/hurricane-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/hurricane.png
-share/wesnoth/data/core/images/units/drakes/inferno-attack-close.png
-share/wesnoth/data/core/images/units/drakes/inferno-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/inferno-defend.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-1.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-2.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-3.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-4.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-5.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-6.png
-share/wesnoth/data/core/images/units/drakes/inferno-die-7.png
-share/wesnoth/data/core/images/units/drakes/inferno-flying.png
+share/wesnoth/data/core/images/units/drakes/inferno-defend-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-defend-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-4.png
+share/wesnoth/data/core/images/units/drakes/inferno-fly-5.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-4.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-5.png
+share/wesnoth/data/core/images/units/drakes/inferno-melee-6.png
+share/wesnoth/data/core/images/units/drakes/inferno-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/inferno-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/inferno-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/inferno-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/inferno.png
-share/wesnoth/data/core/images/units/drakes/sky-attack-melee1.png
-share/wesnoth/data/core/images/units/drakes/sky-attack-melee2.png
-share/wesnoth/data/core/images/units/drakes/sky-attack-ranged-fire.png
-share/wesnoth/data/core/images/units/drakes/sky-attack-ranged-impact.png
-share/wesnoth/data/core/images/units/drakes/sky-defend.png
-share/wesnoth/data/core/images/units/drakes/sky-die-1.png
-share/wesnoth/data/core/images/units/drakes/sky-die-2.png
-share/wesnoth/data/core/images/units/drakes/sky-die-3.png
-share/wesnoth/data/core/images/units/drakes/sky-die-4.png
-share/wesnoth/data/core/images/units/drakes/sky-die-5.png
-share/wesnoth/data/core/images/units/drakes/sky-die-6.png
-share/wesnoth/data/core/images/units/drakes/sky-die-7.png
-share/wesnoth/data/core/images/units/drakes/sky-die-8.png
+share/wesnoth/data/core/images/units/drakes/sky-defend-1.png
+share/wesnoth/data/core/images/units/drakes/sky-defend-2.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/sky-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-1.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-2.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-3.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-4.png
+share/wesnoth/data/core/images/units/drakes/sky-fly-5.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-1.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-2.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-3.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-4.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-5.png
+share/wesnoth/data/core/images/units/drakes/sky-kick-6.png
+share/wesnoth/data/core/images/units/drakes/sky-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/sky-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/sky-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/sky-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/sky.png
-share/wesnoth/data/core/images/units/drakes/slasher-defend.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-1.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-2.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-3.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-4.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-5.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-6.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-7.png
-share/wesnoth/data/core/images/units/drakes/slasher-die-8.png
-share/wesnoth/data/core/images/units/drakes/slasher-flying.png
-share/wesnoth/data/core/images/units/drakes/slasher-pierce.png
-share/wesnoth/data/core/images/units/drakes/slasher-slash.png
 share/wesnoth/data/core/images/units/drakes/slasher.png
-share/wesnoth/data/core/images/units/drakes/warden-defend.png
-share/wesnoth/data/core/images/units/drakes/warden-die-1.png
-share/wesnoth/data/core/images/units/drakes/warden-die-2.png
-share/wesnoth/data/core/images/units/drakes/warden-die-3.png
-share/wesnoth/data/core/images/units/drakes/warden-die-4.png
-share/wesnoth/data/core/images/units/drakes/warden-die-5.png
-share/wesnoth/data/core/images/units/drakes/warden-die-6.png
-share/wesnoth/data/core/images/units/drakes/warden-die-7.png
-share/wesnoth/data/core/images/units/drakes/warden-die-8.png
-share/wesnoth/data/core/images/units/drakes/warden-die-9.png
-share/wesnoth/data/core/images/units/drakes/warden-flying.png
-share/wesnoth/data/core/images/units/drakes/warden-pierce.png
-share/wesnoth/data/core/images/units/drakes/warden-slash.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-1.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-3.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-4.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-5.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-6.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-defend-1.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade-defend-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-blade.png
+share/wesnoth/data/core/images/units/drakes/thrasher-impact-1.png
+share/wesnoth/data/core/images/units/drakes/thrasher-impact-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-impact-3.png
+share/wesnoth/data/core/images/units/drakes/thrasher-impact-4.png
+share/wesnoth/data/core/images/units/drakes/thrasher-impact-5.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-defend-1.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-defend-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-s-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-s-3.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-s-4.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-s-5.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-s-6.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-1.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-2.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-3.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-4.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-5.png
+share/wesnoth/data/core/images/units/drakes/thrasher-spear-se-6.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-s-4.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-s-5.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-s-6.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-1.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-2.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-3.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-4.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-5.png
+share/wesnoth/data/core/images/units/drakes/warden-blade-se-6.png
+share/wesnoth/data/core/images/units/drakes/warden-defend-1.png
+share/wesnoth/data/core/images/units/drakes/warden-defend-2.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-s-3.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-s-4.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-s-5.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-s-6.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-s-7.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-1.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-2.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-3.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-4.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-5.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-6.png
+share/wesnoth/data/core/images/units/drakes/warden-pierce-se-7.png
 share/wesnoth/data/core/images/units/drakes/warden.png
-share/wesnoth/data/core/images/units/drakes/warrior-attack-close1.png
-share/wesnoth/data/core/images/units/drakes/warrior-attack-close2.png
-share/wesnoth/data/core/images/units/drakes/warrior-attack-ranged.png
-share/wesnoth/data/core/images/units/drakes/warrior-defend.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-1.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-2.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-3.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-4.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-5.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-6.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-7.png
-share/wesnoth/data/core/images/units/drakes/warrior-die-8.png
-share/wesnoth/data/core/images/units/drakes/warrior-flying.png
+share/wesnoth/data/core/images/units/drakes/warrior-defend-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-defend-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-inhale-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-inhale-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-inhale-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-inhale-4.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-s-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-s-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-s-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-se-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-se-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-fire-se-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-2-upstroke.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-3-upstroke.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-4.png
+share/wesnoth/data/core/images/units/drakes/warrior-fly-5.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-4.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-5.png
+share/wesnoth/data/core/images/units/drakes/warrior-melee-6.png
+share/wesnoth/data/core/images/units/drakes/warrior-takeoff-1.png
+share/wesnoth/data/core/images/units/drakes/warrior-takeoff-2.png
+share/wesnoth/data/core/images/units/drakes/warrior-takeoff-3.png
+share/wesnoth/data/core/images/units/drakes/warrior-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/warrior.png
 share/wesnoth/data/core/images/units/dwarves/berserker-attack-1.png
 share/wesnoth/data/core/images/units/dwarves/berserker-attack-2.png
@@ -4696,10 +5418,28 @@ share/wesnoth/data/core/images/units/dwarves/dragonguard-attack-ranged-n.png
 share/wesnoth/data/core/images/units/dwarves/dragonguard-attack-ranged-ne.png
 share/wesnoth/data/core/images/units/dwarves/dragonguard-attack-ranged-s.png
 share/wesnoth/data/core/images/units/dwarves/dragonguard-attack-ranged-se.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-1.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-2.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-3.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-4.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-5.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/dragonguard-blade.png
 share/wesnoth/data/core/images/units/dwarves/dragonguard-defend.png
-share/wesnoth/data/core/images/units/dwarves/dragonguard-melee1.png
-share/wesnoth/data/core/images/units/dwarves/dragonguard-melee2.png
 share/wesnoth/data/core/images/units/dwarves/dragonguard.png
+share/wesnoth/data/core/images/units/dwarves/explorer-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/explorer-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-1.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-2.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-3.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-4.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-5.png
+share/wesnoth/data/core/images/units/dwarves/explorer-melee-6.png
+share/wesnoth/data/core/images/units/dwarves/explorer-ranged-1.png
+share/wesnoth/data/core/images/units/dwarves/explorer-ranged-2.png
+share/wesnoth/data/core/images/units/dwarves/explorer-ranged-3.png
+share/wesnoth/data/core/images/units/dwarves/explorer.png
 share/wesnoth/data/core/images/units/dwarves/fighter-axe-1.png
 share/wesnoth/data/core/images/units/dwarves/fighter-axe-2.png
 share/wesnoth/data/core/images/units/dwarves/fighter-axe-3.png
@@ -4714,7 +5454,11 @@ share/wesnoth/data/core/images/units/dwarves/fighter-defend-2.png
 share/wesnoth/data/core/images/units/dwarves/fighter-hammer-1.png
 share/wesnoth/data/core/images/units/dwarves/fighter-hammer-2.png
 share/wesnoth/data/core/images/units/dwarves/fighter-hammer-3.png
-share/wesnoth/data/core/images/units/dwarves/fighter-hammer-defend.png
+share/wesnoth/data/core/images/units/dwarves/fighter-hammer-4.png
+share/wesnoth/data/core/images/units/dwarves/fighter-hammer-5.png
+share/wesnoth/data/core/images/units/dwarves/fighter-hammer-6.png
+share/wesnoth/data/core/images/units/dwarves/fighter-hammer-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/fighter-hammer-defend-2.png
 share/wesnoth/data/core/images/units/dwarves/fighter-hammer.png
 share/wesnoth/data/core/images/units/dwarves/fighter-idle-1.png
 share/wesnoth/data/core/images/units/dwarves/fighter-idle-2.png
@@ -4765,8 +5509,32 @@ share/wesnoth/data/core/images/units/dwarves/lord-axe-8.png
 share/wesnoth/data/core/images/units/dwarves/lord-axe-9.png
 share/wesnoth/data/core/images/units/dwarves/lord-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/lord-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-1.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-2.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-3.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-4.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-5.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-6.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/lord-hammer.png
 share/wesnoth/data/core/images/units/dwarves/lord-ranged.png
 share/wesnoth/data/core/images/units/dwarves/lord.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-1.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-2.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-3.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-4.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-5.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-6.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-melee.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-ranged-1.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-ranged-2.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-ranged-3.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-ranged-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder-ranged-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/pathfinder.png
 share/wesnoth/data/core/images/units/dwarves/runemaster-attack1.png
 share/wesnoth/data/core/images/units/dwarves/runemaster-attack2.png
 share/wesnoth/data/core/images/units/dwarves/runemaster-attack3.png
@@ -4779,6 +5547,20 @@ share/wesnoth/data/core/images/units/dwarves/runemaster-idle-5.png
 share/wesnoth/data/core/images/units/dwarves/runemaster-idle-6.png
 share/wesnoth/data/core/images/units/dwarves/runemaster-idle-7.png
 share/wesnoth/data/core/images/units/dwarves/runemaster.png
+share/wesnoth/data/core/images/units/dwarves/scout-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/scout-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-1.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-2.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-3.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-4.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-5.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-6.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-7.png
+share/wesnoth/data/core/images/units/dwarves/scout-melee-8.png
+share/wesnoth/data/core/images/units/dwarves/scout-ranged-1.png
+share/wesnoth/data/core/images/units/dwarves/scout-ranged-2.png
+share/wesnoth/data/core/images/units/dwarves/scout-ranged-3.png
+share/wesnoth/data/core/images/units/dwarves/scout.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-attack.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-defend-2.png
@@ -4787,7 +5569,6 @@ share/wesnoth/data/core/images/units/dwarves/stalwart-attack.png
 share/wesnoth/data/core/images/units/dwarves/stalwart-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/stalwart-defend-2.png
 share/wesnoth/data/core/images/units/dwarves/stalwart.png
-share/wesnoth/data/core/images/units/dwarves/steelclad-attack-mace.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-axe-1.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-axe-2.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-axe-3.png
@@ -4799,6 +5580,15 @@ share/wesnoth/data/core/images/units/dwarves/steelclad-axe-8.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-axe-9.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-1.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-2.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-3.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-4.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-5.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-6.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/steelclad-hammer.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-1.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-10.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-11.png
@@ -4815,6 +5605,14 @@ share/wesnoth/data/core/images/units/dwarves/thunderer-attack-n.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-attack-ne.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-attack-s.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-attack-se.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-1.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-2.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-3.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-4.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-5.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/thunderer-blade.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-defend.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-die1.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-die2.png
@@ -4825,15 +5623,19 @@ share/wesnoth/data/core/images/units/dwarves/thunderer-idle-3.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-idle-4.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-idle-5.png
 share/wesnoth/data/core/images/units/dwarves/thunderer-idle-6.png
-share/wesnoth/data/core/images/units/dwarves/thunderer-melee1.png
-share/wesnoth/data/core/images/units/dwarves/thunderer-melee2.png
 share/wesnoth/data/core/images/units/dwarves/thunderer.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard-attack-ranged-n.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard-attack-ranged-ne.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard-attack-ranged-s.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard-attack-ranged-se.png
-share/wesnoth/data/core/images/units/dwarves/thunderguard-attack1.png
-share/wesnoth/data/core/images/units/dwarves/thunderguard-attack2.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-1.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-2.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-3.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-4.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-5.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-defend-1.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/thunderguard-blade.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard-defend.png
 share/wesnoth/data/core/images/units/dwarves/thunderguard.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-attack-1.png
@@ -5200,14 +6002,12 @@ share/wesnoth/data/core/images/units/elves-wood/sylph-magic.png
 share/wesnoth/data/core/images/units/elves-wood/sylph-melee.png
 share/wesnoth/data/core/images/units/elves-wood/sylph.png
 share/wesnoth/data/core/images/units/goblins/direwolver-attack.png
-share/wesnoth/data/core/images/units/goblins/direwolver-defend.png
+share/wesnoth/data/core/images/units/goblins/direwolver-defend-1.png
+share/wesnoth/data/core/images/units/goblins/direwolver-defend-2.png
 share/wesnoth/data/core/images/units/goblins/direwolver-idle-1.png
 share/wesnoth/data/core/images/units/goblins/direwolver-idle-2.png
 share/wesnoth/data/core/images/units/goblins/direwolver-idle-3.png
 share/wesnoth/data/core/images/units/goblins/direwolver-idle-4.png
-share/wesnoth/data/core/images/units/goblins/direwolver-idle-5.png
-share/wesnoth/data/core/images/units/goblins/direwolver-idle-6.png
-share/wesnoth/data/core/images/units/goblins/direwolver-idle-7.png
 share/wesnoth/data/core/images/units/goblins/direwolver-moving.png
 share/wesnoth/data/core/images/units/goblins/direwolver.png
 share/wesnoth/data/core/images/units/goblins/impaler-attack-n.png
@@ -5230,7 +6030,8 @@ share/wesnoth/data/core/images/units/goblins/impaler-ne-defend.png
 share/wesnoth/data/core/images/units/goblins/impaler-ne.png
 share/wesnoth/data/core/images/units/goblins/impaler.png
 share/wesnoth/data/core/images/units/goblins/knight-attack.png
-share/wesnoth/data/core/images/units/goblins/knight-defend.png
+share/wesnoth/data/core/images/units/goblins/knight-defend-1.png
+share/wesnoth/data/core/images/units/goblins/knight-defend-2.png
 share/wesnoth/data/core/images/units/goblins/knight-moving.png
 share/wesnoth/data/core/images/units/goblins/knight.png
 share/wesnoth/data/core/images/units/goblins/pillager-attack.png
@@ -5246,7 +6047,8 @@ share/wesnoth/data/core/images/units/goblins/rouser-attack1.png
 share/wesnoth/data/core/images/units/goblins/rouser-attack3.png
 share/wesnoth/data/core/images/units/goblins/rouser-attack4.png
 share/wesnoth/data/core/images/units/goblins/rouser-defend.png
-share/wesnoth/data/core/images/units/goblins/rouser-leading.png
+share/wesnoth/data/core/images/units/goblins/rouser-lead-1.png
+share/wesnoth/data/core/images/units/goblins/rouser-lead-2.png
 share/wesnoth/data/core/images/units/goblins/rouser-ne-defend.png
 share/wesnoth/data/core/images/units/goblins/rouser-ne.png
 share/wesnoth/data/core/images/units/goblins/rouser.png
@@ -5275,7 +6077,8 @@ share/wesnoth/data/core/images/units/goblins/spearman-ne-defend.png
 share/wesnoth/data/core/images/units/goblins/spearman-ne.png
 share/wesnoth/data/core/images/units/goblins/spearman.png
 share/wesnoth/data/core/images/units/goblins/wolf-rider-attack.png
-share/wesnoth/data/core/images/units/goblins/wolf-rider-defend.png
+share/wesnoth/data/core/images/units/goblins/wolf-rider-defend-1.png
+share/wesnoth/data/core/images/units/goblins/wolf-rider-defend-2.png
 share/wesnoth/data/core/images/units/goblins/wolf-rider-idle-1.png
 share/wesnoth/data/core/images/units/goblins/wolf-rider-idle-2.png
 share/wesnoth/data/core/images/units/goblins/wolf-rider-idle-3.png
@@ -5532,6 +6335,12 @@ share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-melee-2-3.pn
 share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-melee-3-3.png
 share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-recover-1.png
 share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-recover-2.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-1.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-2.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-3.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-4.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-5.png
+share/wesnoth/data/core/images/units/human-loyalists/master-at-arms-victory-6.png
 share/wesnoth/data/core/images/units/human-loyalists/master-at-arms.png
 share/wesnoth/data/core/images/units/human-loyalists/masterbowman-bow-attack-1.png
 share/wesnoth/data/core/images/units/human-loyalists/masterbowman-bow-attack-2.png
@@ -5819,12 +6628,16 @@ share/wesnoth/data/core/images/units/human-outlaws/assassin-melee-2-2.png
 share/wesnoth/data/core/images/units/human-outlaws/assassin-throwknife1.png
 share/wesnoth/data/core/images/units/human-outlaws/assassin-throwknife2.png
 share/wesnoth/data/core/images/units/human-outlaws/assassin.png
-share/wesnoth/data/core/images/units/human-outlaws/bandit-defend.png
-share/wesnoth/data/core/images/units/human-outlaws/bandit-die-1.png
-share/wesnoth/data/core/images/units/human-outlaws/bandit-die-2.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-defend-1.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-defend-2.png
 share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-1.png
 share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-2.png
 share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-3.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-4.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-5.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-6.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-7.png
+share/wesnoth/data/core/images/units/human-outlaws/bandit-melee-8.png
 share/wesnoth/data/core/images/units/human-outlaws/bandit.png
 share/wesnoth/data/core/images/units/human-outlaws/footpad+female-attack1.png
 share/wesnoth/data/core/images/units/human-outlaws/footpad+female-attack2.png
@@ -5993,13 +6806,21 @@ share/wesnoth/data/core/images/units/human-outlaws/thief-idle-7.png
 share/wesnoth/data/core/images/units/human-outlaws/thief-idle-8.png
 share/wesnoth/data/core/images/units/human-outlaws/thief-idle-9.png
 share/wesnoth/data/core/images/units/human-outlaws/thief.png
-share/wesnoth/data/core/images/units/human-outlaws/thug-attack.png
-share/wesnoth/data/core/images/units/human-outlaws/thug-defend.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-defend-1.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-defend-2.png
 share/wesnoth/data/core/images/units/human-outlaws/thug-idle-1.png
 share/wesnoth/data/core/images/units/human-outlaws/thug-idle-2.png
 share/wesnoth/data/core/images/units/human-outlaws/thug-idle-3.png
 share/wesnoth/data/core/images/units/human-outlaws/thug-idle-4.png
 share/wesnoth/data/core/images/units/human-outlaws/thug-idle-5.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-1.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-2.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-3.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-4.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-5.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-6.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-7.png
+share/wesnoth/data/core/images/units/human-outlaws/thug-melee-8.png
 share/wesnoth/data/core/images/units/human-outlaws/thug.png
 share/wesnoth/data/core/images/units/human-outlaws/trapper-attack-melee-2.png
 share/wesnoth/data/core/images/units/human-outlaws/trapper-attack-melee.png
@@ -6034,9 +6855,12 @@ share/wesnoth/data/core/images/units/human-peasants/ruffian-defend.png
 share/wesnoth/data/core/images/units/human-peasants/ruffian-melee-1.png
 share/wesnoth/data/core/images/units/human-peasants/ruffian-melee-2.png
 share/wesnoth/data/core/images/units/human-peasants/ruffian.png
-share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-1.png
-share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-2.png
-share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-3.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-attack-1.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-attack-2.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-attack-3.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-attack-4.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow-defend.png
+share/wesnoth/data/core/images/units/human-peasants/woodsman-bow.png
 share/wesnoth/data/core/images/units/human-peasants/woodsman-defend.png
 share/wesnoth/data/core/images/units/human-peasants/woodsman-melee-1.png
 share/wesnoth/data/core/images/units/human-peasants/woodsman-melee-2.png
@@ -6061,20 +6885,26 @@ share/wesnoth/data/core/images/units/merfolk/siren.png
 share/wesnoth/data/core/images/units/merfolk/spearman.png
 share/wesnoth/data/core/images/units/merfolk/triton.png
 share/wesnoth/data/core/images/units/merfolk/warrior.png
-share/wesnoth/data/core/images/units/monsters/cavespider-attack-melee.png
-share/wesnoth/data/core/images/units/monsters/cavespider-attack-ranged.png
-share/wesnoth/data/core/images/units/monsters/cavespider-defend.png
-share/wesnoth/data/core/images/units/monsters/cavespider-die-1.png
-share/wesnoth/data/core/images/units/monsters/cavespider-die-2.png
-share/wesnoth/data/core/images/units/monsters/cavespider.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-attack-2.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-attack-3.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-attack-4.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-attack-ink.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-attack.png
-share/wesnoth/data/core/images/units/monsters/cuttlefish-defend.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-defend-1.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-defend-2.png
 share/wesnoth/data/core/images/units/monsters/cuttlefish-die-1.png
 share/wesnoth/data/core/images/units/monsters/cuttlefish-die-2.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-die-3.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-die-4.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-die-5.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-die-6.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-1.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-2.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-3.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-4.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-5.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-melee-6.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-1.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-2.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-3.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-4.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-5.png
+share/wesnoth/data/core/images/units/monsters/cuttlefish-ranged-6.png
 share/wesnoth/data/core/images/units/monsters/cuttlefish.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-attack.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-defend.png
@@ -6085,6 +6915,15 @@ share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-4.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-5.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-6.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle.png
+share/wesnoth/data/core/images/units/monsters/direwolf-attack.png
+share/wesnoth/data/core/images/units/monsters/direwolf-defend-1.png
+share/wesnoth/data/core/images/units/monsters/direwolf-defend-2.png
+share/wesnoth/data/core/images/units/monsters/direwolf-idle-1.png
+share/wesnoth/data/core/images/units/monsters/direwolf-idle-2.png
+share/wesnoth/data/core/images/units/monsters/direwolf-idle-3.png
+share/wesnoth/data/core/images/units/monsters/direwolf-idle-4.png
+share/wesnoth/data/core/images/units/monsters/direwolf-moving.png
+share/wesnoth/data/core/images/units/monsters/direwolf.png
 share/wesnoth/data/core/images/units/monsters/fire-dragon-attack-fire-1.png
 share/wesnoth/data/core/images/units/monsters/fire-dragon-attack-fire-2.png
 share/wesnoth/data/core/images/units/monsters/fire-dragon-attack-fire-3.png
@@ -6148,8 +6987,53 @@ share/wesnoth/data/core/images/units/monsters/skeletal-dragon-attack-jaw1.png
 share/wesnoth/data/core/images/units/monsters/skeletal-dragon-attack-jaw2.png
 share/wesnoth/data/core/images/units/monsters/skeletal-dragon-defend.png
 share/wesnoth/data/core/images/units/monsters/skeletal-dragon.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-1.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-10.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-11.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-12.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-13.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-2.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-3.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-4.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-5.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-6.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-7.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-8.png
+share/wesnoth/data/core/images/units/monsters/spider-melee-9.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-1.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-2.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-3.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-4.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-5.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-6.png
+share/wesnoth/data/core/images/units/monsters/spider-ranged-7.png
+share/wesnoth/data/core/images/units/monsters/spider.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-n-5.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-n-6.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-1.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-2.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-3.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-4.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-5.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-ne-6.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-s-5.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-s-6.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-1.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-2.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-3.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-4.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-5.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-attack-se-6.png
+share/wesnoth/data/core/images/units/monsters/water-serpent-n.png
+share/wesnoth/data/core/images/units/monsters/water-serpent.png
 share/wesnoth/data/core/images/units/monsters/wolf-attack.png
-share/wesnoth/data/core/images/units/monsters/wolf-defend.png
+share/wesnoth/data/core/images/units/monsters/wolf-defend-1.png
+share/wesnoth/data/core/images/units/monsters/wolf-defend-2.png
+share/wesnoth/data/core/images/units/monsters/wolf-great-attack.png
+share/wesnoth/data/core/images/units/monsters/wolf-great-defend-1.png
+share/wesnoth/data/core/images/units/monsters/wolf-great-defend-2.png
+share/wesnoth/data/core/images/units/monsters/wolf-great-moving.png
+share/wesnoth/data/core/images/units/monsters/wolf-great.png
 share/wesnoth/data/core/images/units/monsters/wolf-moving.png
 share/wesnoth/data/core/images/units/monsters/wolf-water.png
 share/wesnoth/data/core/images/units/monsters/wolf.png
@@ -6218,45 +7102,27 @@ share/wesnoth/data/core/images/units/ogres/young-ogre-idle-2.png
 share/wesnoth/data/core/images/units/ogres/young-ogre-idle-3.png
 share/wesnoth/data/core/images/units/ogres/young-ogre-idle-4.png
 share/wesnoth/data/core/images/units/ogres/young-ogre.png
-share/wesnoth/data/core/images/units/orcs/archer-death-1.png
-share/wesnoth/data/core/images/units/orcs/archer-death-2.png
-share/wesnoth/data/core/images/units/orcs/archer-death-3.png
-share/wesnoth/data/core/images/units/orcs/archer-death-4.png
-share/wesnoth/data/core/images/units/orcs/archer-death-5.png
-share/wesnoth/data/core/images/units/orcs/archer-death-6.png
-share/wesnoth/data/core/images/units/orcs/archer-death-7.png
-share/wesnoth/data/core/images/units/orcs/archer-death-8.png
-share/wesnoth/data/core/images/units/orcs/archer-death-9.png
-share/wesnoth/data/core/images/units/orcs/archer-defend.png
+share/wesnoth/data/core/images/units/orcs/archer-bow-attack-1.png
+share/wesnoth/data/core/images/units/orcs/archer-bow-attack-2.png
+share/wesnoth/data/core/images/units/orcs/archer-bow-attack-3.png
+share/wesnoth/data/core/images/units/orcs/archer-bow-attack-4.png
+share/wesnoth/data/core/images/units/orcs/archer-bow-defend.png
+share/wesnoth/data/core/images/units/orcs/archer-bow.png
+share/wesnoth/data/core/images/units/orcs/archer-defend-1.png
+share/wesnoth/data/core/images/units/orcs/archer-defend-2.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-1.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-2.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-3.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-4.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-5.png
 share/wesnoth/data/core/images/units/orcs/archer-idle-6.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-01.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-02.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-03.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-04.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-05.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-06.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-07.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-08.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-09.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-10.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-11.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-12.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-13.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-14.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-15.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-16.png
-share/wesnoth/data/core/images/units/orcs/archer-melee-17.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-1.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-2.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-3.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-4.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-5.png
-share/wesnoth/data/core/images/units/orcs/archer-ranged-6.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-1.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-2.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-3.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-4.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-5.png
+share/wesnoth/data/core/images/units/orcs/archer-melee-6.png
+share/wesnoth/data/core/images/units/orcs/archer-melee.png
 share/wesnoth/data/core/images/units/orcs/archer.png
 share/wesnoth/data/core/images/units/orcs/assassin-attack-1.png
 share/wesnoth/data/core/images/units/orcs/assassin-attack-2.png
@@ -6305,19 +7171,34 @@ share/wesnoth/data/core/images/units/orcs/grunt-die-6.png
 share/wesnoth/data/core/images/units/orcs/grunt-die-7.png
 share/wesnoth/data/core/images/units/orcs/grunt-die-8.png
 share/wesnoth/data/core/images/units/orcs/grunt.png
-share/wesnoth/data/core/images/units/orcs/leader-attack.png
-share/wesnoth/data/core/images/units/orcs/leader-bow-1.png
-share/wesnoth/data/core/images/units/orcs/leader-bow-defend.png
-share/wesnoth/data/core/images/units/orcs/leader-bow.png
-share/wesnoth/data/core/images/units/orcs/leader-defend.png
-share/wesnoth/data/core/images/units/orcs/leader-leading.png
+share/wesnoth/data/core/images/units/orcs/leader-attack-1.png
+share/wesnoth/data/core/images/units/orcs/leader-attack-2.png
+share/wesnoth/data/core/images/units/orcs/leader-attack-3.png
+share/wesnoth/data/core/images/units/orcs/leader-attack-4.png
+share/wesnoth/data/core/images/units/orcs/leader-attack-5.png
+share/wesnoth/data/core/images/units/orcs/leader-defend-1.png
+share/wesnoth/data/core/images/units/orcs/leader-defend-2.png
+share/wesnoth/data/core/images/units/orcs/leader-lead-1.png
+share/wesnoth/data/core/images/units/orcs/leader-lead-2.png
+share/wesnoth/data/core/images/units/orcs/leader-ranged-attack-1.png
+share/wesnoth/data/core/images/units/orcs/leader-ranged-attack-2.png
+share/wesnoth/data/core/images/units/orcs/leader-ranged-defend.png
+share/wesnoth/data/core/images/units/orcs/leader-ranged.png
 share/wesnoth/data/core/images/units/orcs/leader.png
-share/wesnoth/data/core/images/units/orcs/ruler-attack.png
-share/wesnoth/data/core/images/units/orcs/ruler-bow-defend.png
-share/wesnoth/data/core/images/units/orcs/ruler-defend.png
-share/wesnoth/data/core/images/units/orcs/ruler-leading.png
-share/wesnoth/data/core/images/units/orcs/ruler-ranged-1.png
-share/wesnoth/data/core/images/units/orcs/ruler-ranged-2.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-1.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-2.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-3.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-4.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-5.png
+share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-6.png
+share/wesnoth/data/core/images/units/orcs/ruler-defend-1.png
+share/wesnoth/data/core/images/units/orcs/ruler-defend-2.png
+share/wesnoth/data/core/images/units/orcs/ruler-lead-1.png
+share/wesnoth/data/core/images/units/orcs/ruler-lead-2.png
+share/wesnoth/data/core/images/units/orcs/ruler-ranged-attack-1.png
+share/wesnoth/data/core/images/units/orcs/ruler-ranged-attack-2.png
+share/wesnoth/data/core/images/units/orcs/ruler-ranged-defend.png
+share/wesnoth/data/core/images/units/orcs/ruler-ranged.png
 share/wesnoth/data/core/images/units/orcs/ruler.png
 share/wesnoth/data/core/images/units/orcs/slayer-attack-1.png
 share/wesnoth/data/core/images/units/orcs/slayer-attack-10.png
@@ -6333,10 +7214,6 @@ share/wesnoth/data/core/images/units/orcs/slayer-attack-6.png
 share/wesnoth/data/core/images/units/orcs/slayer-attack-7.png
 share/wesnoth/data/core/images/units/orcs/slayer-attack-8.png
 share/wesnoth/data/core/images/units/orcs/slayer-attack-9.png
-share/wesnoth/data/core/images/units/orcs/slayer-attack1-s.png
-share/wesnoth/data/core/images/units/orcs/slayer-attack1.png
-share/wesnoth/data/core/images/units/orcs/slayer-attack2-s.png
-share/wesnoth/data/core/images/units/orcs/slayer-attack2.png
 share/wesnoth/data/core/images/units/orcs/slayer-defend.png
 share/wesnoth/data/core/images/units/orcs/slayer-ranged1.png
 share/wesnoth/data/core/images/units/orcs/slayer-ranged2.png
@@ -6353,23 +7230,32 @@ share/wesnoth/data/core/images/units/orcs/slurbow-ranged-2.png
 share/wesnoth/data/core/images/units/orcs/slurbow-ranged-defend.png
 share/wesnoth/data/core/images/units/orcs/slurbow-ranged.png
 share/wesnoth/data/core/images/units/orcs/slurbow.png
-share/wesnoth/data/core/images/units/orcs/sovereign-attack1.png
-share/wesnoth/data/core/images/units/orcs/sovereign-attack2.png
-share/wesnoth/data/core/images/units/orcs/sovereign-bow-defend.png
-share/wesnoth/data/core/images/units/orcs/sovereign-defend.png
-share/wesnoth/data/core/images/units/orcs/sovereign-leading.png
-share/wesnoth/data/core/images/units/orcs/sovereign-ranged-1.png
-share/wesnoth/data/core/images/units/orcs/sovereign-ranged-2.png
+share/wesnoth/data/core/images/units/orcs/sovereign-attack-1.png
+share/wesnoth/data/core/images/units/orcs/sovereign-attack-2.png
+share/wesnoth/data/core/images/units/orcs/sovereign-attack-3.png
+share/wesnoth/data/core/images/units/orcs/sovereign-attack-4.png
+share/wesnoth/data/core/images/units/orcs/sovereign-attack-5.png
+share/wesnoth/data/core/images/units/orcs/sovereign-defend-1.png
+share/wesnoth/data/core/images/units/orcs/sovereign-defend-2.png
+share/wesnoth/data/core/images/units/orcs/sovereign-lead-1.png
+share/wesnoth/data/core/images/units/orcs/sovereign-lead-2.png
+share/wesnoth/data/core/images/units/orcs/sovereign-ranged-attack-1.png
+share/wesnoth/data/core/images/units/orcs/sovereign-ranged-attack-2.png
+share/wesnoth/data/core/images/units/orcs/sovereign-ranged-defend.png
+share/wesnoth/data/core/images/units/orcs/sovereign-ranged.png
 share/wesnoth/data/core/images/units/orcs/sovereign.png
 share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-1.png
 share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-2.png
 share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-3.png
 share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-4.png
-share/wesnoth/data/core/images/units/orcs/warlord-bow-1.png
-share/wesnoth/data/core/images/units/orcs/warlord-bow-2.png
-share/wesnoth/data/core/images/units/orcs/warlord-bow-3.png
-share/wesnoth/data/core/images/units/orcs/warlord-bow-4.png
+share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-5.png
+share/wesnoth/data/core/images/units/orcs/warlord-attack-sword-6.png
+share/wesnoth/data/core/images/units/orcs/warlord-bow-attack-1.png
+share/wesnoth/data/core/images/units/orcs/warlord-bow-attack-2.png
+share/wesnoth/data/core/images/units/orcs/warlord-bow-attack-3.png
+share/wesnoth/data/core/images/units/orcs/warlord-bow-attack-4.png
 share/wesnoth/data/core/images/units/orcs/warlord-bow-defend.png
+share/wesnoth/data/core/images/units/orcs/warlord-bow.png
 share/wesnoth/data/core/images/units/orcs/warlord-defend-1.png
 share/wesnoth/data/core/images/units/orcs/warlord-defend-2.png
 share/wesnoth/data/core/images/units/orcs/warlord.png
@@ -6382,11 +7268,15 @@ share/wesnoth/data/core/images/units/orcs/warrior-defend-1.png
 share/wesnoth/data/core/images/units/orcs/warrior-defend-2.png
 share/wesnoth/data/core/images/units/orcs/warrior.png
 share/wesnoth/data/core/images/units/orcs/xbowman-defend.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-attack-1.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-attack-2.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-attack-3.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-attack-4.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-defend-1.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee-defend-2.png
+share/wesnoth/data/core/images/units/orcs/xbowman-melee.png
 share/wesnoth/data/core/images/units/orcs/xbowman-ranged-1.png
 share/wesnoth/data/core/images/units/orcs/xbowman-ranged-2.png
-share/wesnoth/data/core/images/units/orcs/xbowman-sword-1.png
-share/wesnoth/data/core/images/units/orcs/xbowman-sword-defend.png
-share/wesnoth/data/core/images/units/orcs/xbowman-sword.png
 share/wesnoth/data/core/images/units/orcs/xbowman.png
 share/wesnoth/data/core/images/units/random-dice.png
 share/wesnoth/data/core/images/units/saurians/ambusher-attack1.png
@@ -6481,6 +7371,18 @@ share/wesnoth/data/core/images/units/trolls/shaman-ranged-1.png
 share/wesnoth/data/core/images/units/trolls/shaman-ranged-2.png
 share/wesnoth/data/core/images/units/trolls/shaman-ranged-3.png
 share/wesnoth/data/core/images/units/trolls/shaman.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-s-4.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-s-5.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-s-6.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-1.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-2.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-3.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-4.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-5.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-attack-se-6.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-defend-1.png
+share/wesnoth/data/core/images/units/trolls/troll-hero-defend-2.png
+share/wesnoth/data/core/images/units/trolls/troll-hero.png
 share/wesnoth/data/core/images/units/trolls/warrior-attack-1.png
 share/wesnoth/data/core/images/units/trolls/warrior-attack-2.png
 share/wesnoth/data/core/images/units/trolls/warrior-attack-3.png
@@ -6492,13 +7394,6 @@ share/wesnoth/data/core/images/units/trolls/whelp-attack-2.png
 share/wesnoth/data/core/images/units/trolls/whelp-attack-3.png
 share/wesnoth/data/core/images/units/trolls/whelp-defend-2.png
 share/wesnoth/data/core/images/units/trolls/whelp-defend.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-1.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-2.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-3.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-4.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-5.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-6.png
-share/wesnoth/data/core/images/units/trolls/whelp-die-7.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-1.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-2.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-3.png
@@ -6506,7 +7401,6 @@ share/wesnoth/data/core/images/units/trolls/whelp-idle-4.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-5.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-6.png
 share/wesnoth/data/core/images/units/trolls/whelp-idle-7.png
-share/wesnoth/data/core/images/units/trolls/whelp-skeleton.png
 share/wesnoth/data/core/images/units/trolls/whelp.png
 share/wesnoth/data/core/images/units/undead-necromancers/adept+female-defend-1.png
 share/wesnoth/data/core/images/units/undead-necromancers/adept+female-defend-2.png
@@ -6570,8 +7464,12 @@ share/wesnoth/data/core/images/units/undead-necromancers/necromancer-magic-2.png
 share/wesnoth/data/core/images/units/undead-necromancers/necromancer-magic-3.png
 share/wesnoth/data/core/images/units/undead-necromancers/necromancer.png
 share/wesnoth/data/core/images/units/undead-skeletal/archer-attack.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-attack1.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-attack2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-defend.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer-bow.png
 share/wesnoth/data/core/images/units/undead-skeletal/archer-defend.png
 share/wesnoth/data/core/images/units/undead-skeletal/archer-die-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/archer-die-10.png
@@ -6634,11 +7532,12 @@ share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-attack-4
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-melee-defend-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter.png
-share/wesnoth/data/core/images/units/undead-skeletal/chocobone-attack.png
-share/wesnoth/data/core/images/units/undead-skeletal/chocobone-defend.png
-share/wesnoth/data/core/images/units/undead-skeletal/chocobone-die-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/chocobone-die-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/chocobone-moving.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-attack-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-attack-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-attack-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-attack-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-defend-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/chocobone-defend-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/chocobone.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathblade-attack1.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathblade-attack2.png
@@ -6664,6 +7563,8 @@ share/wesnoth/data/core/images/units/undead-skeletal/deathknight-crossbow-defend
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-crossbow.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-defend-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-defend-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/deathknight-lead-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/deathknight-lead-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-melee-attack-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-melee-attack-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight-melee-attack-3.png
@@ -6800,6 +7701,20 @@ share/wesnoth/data/core/images/units/undead/shadow-s-attack-6.png
 share/wesnoth/data/core/images/units/undead/soulless-attack-n.png
 share/wesnoth/data/core/images/units/undead/soulless-attack-s.png
 share/wesnoth/data/core/images/units/undead/soulless-attack.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-die-1.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-die-2.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-die-3.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-die-4.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-ne-1.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-ne-2.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-ne-3.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-ne-4.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-ne-5.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-se-1.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-se-2.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-se-3.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-se-4.png
+share/wesnoth/data/core/images/units/undead/soulless-bat-se-5.png
 share/wesnoth/data/core/images/units/undead/soulless-defend.png
 share/wesnoth/data/core/images/units/undead/soulless-die-1.png
 share/wesnoth/data/core/images/units/undead/soulless-die-10.png
@@ -6827,6 +7742,15 @@ share/wesnoth/data/core/images/units/undead/soulless-dwarf-die-2.png
 share/wesnoth/data/core/images/units/undead/soulless-dwarf-die-3.png
 share/wesnoth/data/core/images/units/undead/soulless-dwarf-die-4.png
 share/wesnoth/data/core/images/units/undead/soulless-dwarf.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-attack-n.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-attack-s.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-attack.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-defend.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-die-1.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-die-2.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-die-3.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin-die-4.png
+share/wesnoth/data/core/images/units/undead/soulless-goblin.png
 share/wesnoth/data/core/images/units/undead/soulless-melee.png
 share/wesnoth/data/core/images/units/undead/soulless-mounted-attack-n.png
 share/wesnoth/data/core/images/units/undead/soulless-mounted-attack-s.png
@@ -6920,6 +7844,10 @@ share/wesnoth/data/core/images/units/undead/zombie-drake-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-drake-attack-s.png
 share/wesnoth/data/core/images/units/undead/zombie-drake-attack.png
 share/wesnoth/data/core/images/units/undead/zombie-drake-defend.png
+share/wesnoth/data/core/images/units/undead/zombie-drake-die-1.png
+share/wesnoth/data/core/images/units/undead/zombie-drake-die-2.png
+share/wesnoth/data/core/images/units/undead/zombie-drake-die-3.png
+share/wesnoth/data/core/images/units/undead/zombie-drake-die-4.png
 share/wesnoth/data/core/images/units/undead/zombie-drake.png
 share/wesnoth/data/core/images/units/undead/zombie-dwarf-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-dwarf-attack-s.png
@@ -6930,10 +7858,23 @@ share/wesnoth/data/core/images/units/undead/zombie-dwarf-die-2.png
 share/wesnoth/data/core/images/units/undead/zombie-dwarf-die-3.png
 share/wesnoth/data/core/images/units/undead/zombie-dwarf-die-4.png
 share/wesnoth/data/core/images/units/undead/zombie-dwarf.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-attack-n.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-attack-s.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-attack.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-defend.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-die-1.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-die-2.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-die-3.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin-die-4.png
+share/wesnoth/data/core/images/units/undead/zombie-goblin.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack-s.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-defend.png
+share/wesnoth/data/core/images/units/undead/zombie-mounted-die-1.png
+share/wesnoth/data/core/images/units/undead/zombie-mounted-die-2.png
+share/wesnoth/data/core/images/units/undead/zombie-mounted-die-3.png
+share/wesnoth/data/core/images/units/undead/zombie-mounted-die-4.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted.png
 share/wesnoth/data/core/images/units/undead/zombie-saurian-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-saurian-attack-s.png
@@ -7041,6 +7982,8 @@ share/wesnoth/data/core/images/units/woses/wose-elder.png
 share/wesnoth/data/core/images/units/woses/wose.png
 share/wesnoth/data/core/images/wesnoth-icon.png
 share/wesnoth/data/core/macros/abilities.cfg
+share/wesnoth/data/core/macros/ai.cfg
+share/wesnoth/data/core/macros/ai_candidate_actions.cfg
 share/wesnoth/data/core/macros/ai_controller.cfg
 share/wesnoth/data/core/macros/amla.cfg
 share/wesnoth/data/core/macros/animation-utils.cfg
@@ -7057,6 +8000,7 @@ share/wesnoth/data/core/macros/schedules.cfg
 share/wesnoth/data/core/macros/side-utils.cfg
 share/wesnoth/data/core/macros/sound-utils.cfg
 share/wesnoth/data/core/macros/special-notes.cfg
+share/wesnoth/data/core/macros/story.cfg
 share/wesnoth/data/core/macros/teleport-utils.cfg
 share/wesnoth/data/core/macros/terrain-utils.cfg
 share/wesnoth/data/core/macros/traits.cfg
@@ -7064,18 +8008,22 @@ share/wesnoth/data/core/macros/unit-utils.cfg
 share/wesnoth/data/core/macros/utils.cfg
 share/wesnoth/data/core/music/battle.ogg
 share/wesnoth/data/core/music/breaking_the_chains.ogg
+share/wesnoth/data/core/music/casualties_of_war.ogg
 share/wesnoth/data/core/music/defeat.ogg
 share/wesnoth/data/core/music/defeat2.ogg
 share/wesnoth/data/core/music/elf-land.ogg
 share/wesnoth/data/core/music/elvish-theme.ogg
 share/wesnoth/data/core/music/frantic.ogg
 share/wesnoth/data/core/music/heroes_rite.ogg
+share/wesnoth/data/core/music/into_the_shadows.ogg
+share/wesnoth/data/core/music/journeys_end.ogg
 share/wesnoth/data/core/music/knalgan_theme.ogg
 share/wesnoth/data/core/music/knolls.ogg
 share/wesnoth/data/core/music/legends_of_the_north.ogg
 share/wesnoth/data/core/music/love_theme.ogg
 share/wesnoth/data/core/music/loyalists.ogg
 share/wesnoth/data/core/music/main_menu.ogg
+share/wesnoth/data/core/music/northern_mountains.ogg
 share/wesnoth/data/core/music/northerners.ogg
 share/wesnoth/data/core/music/nunc_dimittis.ogg
 share/wesnoth/data/core/music/revelation.ogg
@@ -7094,6 +8042,7 @@ share/wesnoth/data/core/music/vengeful.ogg
 share/wesnoth/data/core/music/victory.ogg
 share/wesnoth/data/core/music/victory2.ogg
 share/wesnoth/data/core/music/wanderer.ogg
+share/wesnoth/data/core/music/weight_of_revenge.ogg
 share/wesnoth/data/core/sounds/ambient/birds1.ogg
 share/wesnoth/data/core/sounds/ambient/birds2.ogg
 share/wesnoth/data/core/sounds/ambient/birds3.ogg
@@ -7173,6 +8122,14 @@ share/wesnoth/data/core/sounds/hiss-big.wav
 share/wesnoth/data/core/sounds/hiss-die.wav
 share/wesnoth/data/core/sounds/hiss-hit.wav
 share/wesnoth/data/core/sounds/hiss.wav
+share/wesnoth/data/core/sounds/horn-signals/horn-1.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-2.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-3.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-4.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-5.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-6.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-7.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-8.ogg
 share/wesnoth/data/core/sounds/horse-canter.wav
 share/wesnoth/data/core/sounds/horse-die.ogg
 share/wesnoth/data/core/sounds/horse-elf-canter.wav
@@ -7264,8 +8221,10 @@ share/wesnoth/data/core/sounds/orc-small-hit-1.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-2.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-3.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-4.ogg
+share/wesnoth/data/core/sounds/petrified.ogg
 share/wesnoth/data/core/sounds/pincers.ogg
 share/wesnoth/data/core/sounds/poison.ogg
+share/wesnoth/data/core/sounds/potion.ogg
 share/wesnoth/data/core/sounds/rumble.ogg
 share/wesnoth/data/core/sounds/skeleton-big-die.ogg
 share/wesnoth/data/core/sounds/skeleton-big-hit-1.ogg
@@ -7288,7 +8247,6 @@ share/wesnoth/data/core/sounds/squishy-hit.wav
 share/wesnoth/data/core/sounds/squishy-miss.wav
 share/wesnoth/data/core/sounds/squishy-strike.wav
 share/wesnoth/data/core/sounds/staff.wav
-share/wesnoth/data/core/sounds/stoned.ogg
 share/wesnoth/data/core/sounds/sword-1.ogg
 share/wesnoth/data/core/sounds/tail.ogg
 share/wesnoth/data/core/sounds/throw-1.wav
@@ -7362,6 +8320,7 @@ share/wesnoth/data/core/units/boats/Boat.cfg
 share/wesnoth/data/core/units/boats/Galleon.cfg
 share/wesnoth/data/core/units/boats/Pirate_Galleon.cfg
 share/wesnoth/data/core/units/boats/Transport_Galleon.cfg
+share/wesnoth/data/core/units/drakes/Arbiter.cfg
 share/wesnoth/data/core/units/drakes/Armageddon.cfg
 share/wesnoth/data/core/units/drakes/Blademaster.cfg
 share/wesnoth/data/core/units/drakes/Burner.cfg
@@ -7371,20 +8330,22 @@ share/wesnoth/data/core/units/drakes/Fighter.cfg
 share/wesnoth/data/core/units/drakes/Fire.cfg
 share/wesnoth/data/core/units/drakes/Flameheart.cfg
 share/wesnoth/data/core/units/drakes/Flare.cfg
-share/wesnoth/data/core/units/drakes/Gladiator.cfg
 share/wesnoth/data/core/units/drakes/Glider.cfg
 share/wesnoth/data/core/units/drakes/Hurricane.cfg
 share/wesnoth/data/core/units/drakes/Inferno.cfg
 share/wesnoth/data/core/units/drakes/Sky.cfg
-share/wesnoth/data/core/units/drakes/Slasher.cfg
+share/wesnoth/data/core/units/drakes/Thrasher.cfg
 share/wesnoth/data/core/units/drakes/Warden.cfg
 share/wesnoth/data/core/units/drakes/Warrior.cfg
 share/wesnoth/data/core/units/dwarves/Berserker.cfg
 share/wesnoth/data/core/units/dwarves/Dragonguard.cfg
+share/wesnoth/data/core/units/dwarves/Explorer.cfg
 share/wesnoth/data/core/units/dwarves/Fighter.cfg
 share/wesnoth/data/core/units/dwarves/Guardsman.cfg
 share/wesnoth/data/core/units/dwarves/Lord.cfg
+share/wesnoth/data/core/units/dwarves/Pathfinder.cfg
 share/wesnoth/data/core/units/dwarves/Runemaster.cfg
+share/wesnoth/data/core/units/dwarves/Scout.cfg
 share/wesnoth/data/core/units/dwarves/Sentinel.cfg
 share/wesnoth/data/core/units/dwarves/Stalwart.cfg
 share/wesnoth/data/core/units/dwarves/Steelclad.cfg
@@ -7499,6 +8460,7 @@ share/wesnoth/data/core/units/monsters/Mudcrawler.cfg
 share/wesnoth/data/core/units/monsters/Sea_Serpent.cfg
 share/wesnoth/data/core/units/monsters/Skeletal_Dragon.cfg
 share/wesnoth/data/core/units/monsters/Tentacle.cfg
+share/wesnoth/data/core/units/monsters/Water_Serpent.cfg
 share/wesnoth/data/core/units/monsters/Wolf.cfg
 share/wesnoth/data/core/units/monsters/Yeti.cfg
 share/wesnoth/data/core/units/nagas/Fighter.cfg
@@ -7570,20 +8532,27 @@ share/wesnoth/data/gui/default/widget/listbox_default.cfg
 share/wesnoth/data/gui/default/widget/listbox_wml_message.cfg
 share/wesnoth/data/gui/default/widget/menubar_default.cfg
 share/wesnoth/data/gui/default/widget/minimap_default.cfg
+share/wesnoth/data/gui/default/widget/multi_page_default.cfg
 share/wesnoth/data/gui/default/widget/panel_default.cfg
+share/wesnoth/data/gui/default/widget/panel_title_screen.cfg
 share/wesnoth/data/gui/default/widget/panel_wml_message.cfg
+share/wesnoth/data/gui/default/widget/repeating_button_default.cfg
 share/wesnoth/data/gui/default/widget/scroll_label_default.cfg
 share/wesnoth/data/gui/default/widget/scroll_label_wml_message.cfg
+share/wesnoth/data/gui/default/widget/scrollbar_panel_default.cfg
 share/wesnoth/data/gui/default/widget/slider_default.cfg
 share/wesnoth/data/gui/default/widget/spacer_default.cfg
+share/wesnoth/data/gui/default/widget/stacked_widget_default.cfg
 share/wesnoth/data/gui/default/widget/text_box_default.cfg
 share/wesnoth/data/gui/default/widget/toggle_button_default.cfg
 share/wesnoth/data/gui/default/widget/toggle_button_icon.cfg
 share/wesnoth/data/gui/default/widget/toggle_button_listbox_text.cfg
 share/wesnoth/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
+share/wesnoth/data/gui/default/widget/toggle_button_tree_view_node.cfg
 share/wesnoth/data/gui/default/widget/toggle_panel_default.cfg
 share/wesnoth/data/gui/default/widget/toggle_panel_wml_message.cfg
 share/wesnoth/data/gui/default/widget/tooltip_default.cfg
+share/wesnoth/data/gui/default/widget/tree_view_default.cfg
 share/wesnoth/data/gui/default/widget/vertical_scrollbar_default.cfg
 share/wesnoth/data/gui/default/widget/window_default.cfg
 share/wesnoth/data/gui/default/window/addon_connect.cfg
@@ -7593,7 +8562,18 @@ share/wesnoth/data/gui/default/window/editor_generate_map.cfg
 share/wesnoth/data/gui/default/window/editor_new_map.cfg
 share/wesnoth/data/gui/default/window/editor_resize_map.cfg
 share/wesnoth/data/gui/default/window/editor_settings.cfg
+share/wesnoth/data/gui/default/window/formula_debugger.cfg
+share/wesnoth/data/gui/default/window/game_delete.cfg
+share/wesnoth/data/gui/default/window/game_load.cfg
+share/wesnoth/data/gui/default/window/game_save.cfg
+share/wesnoth/data/gui/default/window/game_save_message.cfg
+share/wesnoth/data/gui/default/window/game_save_oos.cfg
+share/wesnoth/data/gui/default/window/game_save_overwrite.cfg
+share/wesnoth/data/gui/default/window/gamestate_inspector.cfg
+share/wesnoth/data/gui/default/window/icon_message.cfg
 share/wesnoth/data/gui/default/window/language_selection.cfg
+share/wesnoth/data/gui/default/window/lobby_main.cfg
+share/wesnoth/data/gui/default/window/lobby_player_info.cfg
 share/wesnoth/data/gui/default/window/message.cfg
 share/wesnoth/data/gui/default/window/mp_cmd_wrapper.cfg
 share/wesnoth/data/gui/default/window/mp_connect.cfg
@@ -7602,6 +8582,8 @@ share/wesnoth/data/gui/default/window/mp_login.cfg
 share/wesnoth/data/gui/default/window/mp_method_selection.cfg
 share/wesnoth/data/gui/default/window/mp_server_list.cfg
 share/wesnoth/data/gui/default/window/title_screen.cfg
+share/wesnoth/data/gui/default/window/transient_message.cfg
+share/wesnoth/data/gui/default/window/unit_create.cfg
 share/wesnoth/data/gui/default/window/wml_message.cfg
 share/wesnoth/data/hardwired/WARNING
 share/wesnoth/data/hardwired/english.cfg
@@ -7619,6 +8601,7 @@ share/wesnoth/data/languages/cs_CZ.cfg
 share/wesnoth/data/languages/da_DK.cfg
 share/wesnoth/data/languages/de_DE.cfg
 share/wesnoth/data/languages/el_GR.cfg
+share/wesnoth/data/languages/en@shaw.cfg
 share/wesnoth/data/languages/en_GB.cfg
 share/wesnoth/data/languages/eo_XX.cfg
 share/wesnoth/data/languages/es_ES.cfg
@@ -7652,12 +8635,17 @@ share/wesnoth/data/languages/ru_RU.cfg
 share/wesnoth/data/languages/sk_SK.cfg
 share/wesnoth/data/languages/sl_SI.cfg
 share/wesnoth/data/languages/sr_RS.cfg
+share/wesnoth/data/languages/sr_RS@ijekavian.cfg
+share/wesnoth/data/languages/sr_RS@ijekavianlatin.cfg
 share/wesnoth/data/languages/sr_RS@latin.cfg
 share/wesnoth/data/languages/sv_SE.cfg
 share/wesnoth/data/languages/tl_PH.cfg
 share/wesnoth/data/languages/tr_TR.cfg
+share/wesnoth/data/languages/vi_VI.cfg
 share/wesnoth/data/languages/zh_CN.cfg
 share/wesnoth/data/languages/zh_TW.cfg
+share/wesnoth/data/lua/helper.lua
+share/wesnoth/data/lua/wml-tags.lua
 share/wesnoth/data/multiplayer/_main.cfg
 share/wesnoth/data/multiplayer/eras.cfg
 share/wesnoth/data/multiplayer/factions/drakes-aoh.cfg
@@ -7675,6 +8663,7 @@ share/wesnoth/data/multiplayer/factions/undead-default.cfg
 share/wesnoth/data/multiplayer/maps/2p_Caves_of_the_Basilisk.map
 share/wesnoth/data/multiplayer/maps/2p_Cynsaun_Battlefield.map
 share/wesnoth/data/multiplayer/maps/2p_Den_of_Onis.map
+share/wesnoth/data/multiplayer/maps/2p_Elensefar_Courtyard.map
 share/wesnoth/data/multiplayer/maps/2p_Fallenstar_Lake.map
 share/wesnoth/data/multiplayer/maps/2p_Hamlets.map
 share/wesnoth/data/multiplayer/maps/2p_Hornshark_Island.map
@@ -7698,12 +8687,13 @@ share/wesnoth/data/multiplayer/maps/4p_Lagoon.map
 share/wesnoth/data/multiplayer/maps/4p_Loris_River.map
 share/wesnoth/data/multiplayer/maps/4p_Morituri.map
 share/wesnoth/data/multiplayer/maps/4p_Paths_of_Daggers.map
+share/wesnoth/data/multiplayer/maps/4p_Ruins_of_Terra-Dwelve.map
 share/wesnoth/data/multiplayer/maps/4p_Siege_Castles.map
-share/wesnoth/data/multiplayer/maps/4p_The_Wilderlands.map
 share/wesnoth/data/multiplayer/maps/4p_Underworld.map
 share/wesnoth/data/multiplayer/maps/4p_Xanthe_Chaos.map
 share/wesnoth/data/multiplayer/maps/5p_Auction-X.map
 share/wesnoth/data/multiplayer/maps/5p_Forest_of_Fear.map
+share/wesnoth/data/multiplayer/maps/5p_The_Wilderlands.map
 share/wesnoth/data/multiplayer/maps/6p_Crusaders_Field.map
 share/wesnoth/data/multiplayer/maps/6p_Hexcake.map
 share/wesnoth/data/multiplayer/maps/6p_The_Manzivan_Traps.map
@@ -7721,6 +8711,7 @@ share/wesnoth/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Den_of_Onis.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Hamlets.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Hornshark_Island.cfg
@@ -7744,12 +8735,13 @@ share/wesnoth/data/multiplayer/scenarios/4p_Lagoon.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Loris_River.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Morituri.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg
+share/wesnoth/data/multiplayer/scenarios/4p_Ruins_of_Terra-Dwelve.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Siege_Castles.cfg
-share/wesnoth/data/multiplayer/scenarios/4p_The_Wilderlands.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Underworld.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Xanthe_Chaos.cfg
 share/wesnoth/data/multiplayer/scenarios/5p_Auction-X.cfg
 share/wesnoth/data/multiplayer/scenarios/5p_Forest_of_Fear.cfg
+share/wesnoth/data/multiplayer/scenarios/5p_The_Wilderlands.cfg
 share/wesnoth/data/multiplayer/scenarios/6p_Crusaders_Field.cfg
 share/wesnoth/data/multiplayer/scenarios/6p_Hexcake.cfg
 share/wesnoth/data/multiplayer/scenarios/6p_Team_Survival.cfg
@@ -7774,11 +8766,22 @@ share/wesnoth/data/multiplayer/scenarios/Wesbench_Scroll.cfg
 share/wesnoth/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg
 share/wesnoth/data/scenario-formula-recruitment.cfg
 share/wesnoth/data/scenario-formula.cfg
+share/wesnoth/data/scenario-leaders.cfg
+share/wesnoth/data/scenario-poisoning.cfg
 share/wesnoth/data/scenario-test.cfg
+share/wesnoth/data/schema-gui.cfg
+share/wesnoth/data/schema.cfg
 share/wesnoth/data/temp-file_send_data_strings.cfg
+share/wesnoth/data/test/_main.cfg
+share/wesnoth/data/test/macros/readme.txt
+share/wesnoth/data/test/scenarios/_main.cfg
+share/wesnoth/data/test/scenarios/readme.txt
+share/wesnoth/data/test/test/_main.cfg
+share/wesnoth/data/test/test/leading_space.cfg
+share/wesnoth/data/test/test/umc.cfg
 share/wesnoth/data/themes/default.cfg
 share/wesnoth/data/themes/dfool.cfg
-share/wesnoth/data/themes/editor2.cfg
+share/wesnoth/data/themes/editor.cfg
 share/wesnoth/data/themes/experimental.cfg
 share/wesnoth/data/themes/macros.cfg
 share/wesnoth/data/tools/README
@@ -7832,8 +8835,10 @@ 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/tools/extractbindings
-share/wesnoth/data/tools/helpheader.xhtml
-share/wesnoth/data/tools/helptrailer.xhtml
+share/wesnoth/data/tools/helpheader.html
+share/wesnoth/data/tools/helptrailer.html
+share/wesnoth/data/tools/hexometer/alphamask.png
+share/wesnoth/data/tools/hexometer/hexometer
 share/wesnoth/data/tools/journeylifter
 share/wesnoth/data/tools/scoutDefault.py
 share/wesnoth/data/tools/terrain2wiki.rb
@@ -7861,8 +8866,10 @@ share/wesnoth/data/tools/wmllint
 share/wesnoth/data/tools/wmllint_gui
 share/wesnoth/data/tools/wmlmove
 share/wesnoth/data/tools/wmlscope
-share/wesnoth/data/tools/wmltest
 share/wesnoth/data/tools/wmlunits
+share/wesnoth/data/tools/wmlvalidator
+share/wesnoth/data/tools/wmlxgettext
+share/wesnoth/fonts/Andagii.ttf
 share/wesnoth/fonts/COPYING
 share/wesnoth/fonts/DejaVuSans.ttf
 share/wesnoth/fonts/wqy-zenhei.ttc
@@ -7910,6 +8917,9 @@ share/wesnoth/images/buttons/flip_map_button_editor.png
 share/wesnoth/images/buttons/flood_button_editor-active.png
 share/wesnoth/images/buttons/flood_button_editor-pressed.png
 share/wesnoth/images/buttons/flood_button_editor.png
+share/wesnoth/images/buttons/fold-arrow-active.png
+share/wesnoth/images/buttons/fold-arrow-pressed.png
+share/wesnoth/images/buttons/fold-arrow.png
 share/wesnoth/images/buttons/group_all-active-pressed.png
 share/wesnoth/images/buttons/group_all-active.png
 share/wesnoth/images/buttons/group_all-pressed.png
@@ -8112,6 +9122,9 @@ share/wesnoth/images/buttons/toggle_grid_button_editor.png
 share/wesnoth/images/buttons/undo_button_editor-active.png
 share/wesnoth/images/buttons/undo_button_editor-pressed.png
 share/wesnoth/images/buttons/undo_button_editor.png
+share/wesnoth/images/buttons/unfold-arrow-active.png
+share/wesnoth/images/buttons/unfold-arrow-pressed.png
+share/wesnoth/images/buttons/unfold-arrow.png
 share/wesnoth/images/buttons/uparrow-button-active.png
 share/wesnoth/images/buttons/uparrow-button-disabled.png
 share/wesnoth/images/buttons/uparrow-button-pressed.png
@@ -8298,6 +9311,14 @@ share/wesnoth/images/misc/hidden.png
 share/wesnoth/images/misc/icon-advance.png
 share/wesnoth/images/misc/icon-ellipsis.png
 share/wesnoth/images/misc/invisible.png
+share/wesnoth/images/misc/l10n/en@shaw/logo.png
+share/wesnoth/images/misc/l10n/es/logo.png
+share/wesnoth/images/misc/l10n/hu/logo.png
+share/wesnoth/images/misc/l10n/la/logo.png
+share/wesnoth/images/misc/l10n/lt/logo.png
+share/wesnoth/images/misc/l10n/sr/logo.png
+share/wesnoth/images/misc/l10n/sr@latin/logo.png
+share/wesnoth/images/misc/l10n/zh_CN/logo.png
 share/wesnoth/images/misc/leader-crown.png
 share/wesnoth/images/misc/leader-expendable.png
 share/wesnoth/images/misc/lobby.png
@@ -8305,6 +9326,7 @@ share/wesnoth/images/misc/lobby_tiny.png
 share/wesnoth/images/misc/logo.png
 share/wesnoth/images/misc/missing-image.png
 share/wesnoth/images/misc/no_observer.png
+share/wesnoth/images/misc/petrified.png
 share/wesnoth/images/misc/poisoned.png
 share/wesnoth/images/misc/selection-background.png
 share/wesnoth/images/misc/selection-border-botleft.png
@@ -8340,10 +9362,10 @@ share/wesnoth/images/misc/status-friend.png
 share/wesnoth/images/misc/status-ignore.png
 share/wesnoth/images/misc/status-neutral.png
 share/wesnoth/images/misc/status-self.png
-share/wesnoth/images/misc/stone.png
 share/wesnoth/images/misc/tod-bright.png
 share/wesnoth/images/misc/topleft-corner.png
 share/wesnoth/images/misc/topright-corner.png
+share/wesnoth/images/misc/waypoint.png
 share/wesnoth/images/misc/zoc.png
 share/wesnoth/images/tools/chasm-convex.png
 share/wesnoth/images/tools/chasm-exploded-concave.png
@@ -8355,6 +9377,7 @@ share/wesnoth/images/tools/exploder/mask-castle-sw.png
 share/wesnoth/images/tools/exploder/mask-castle-w.png
 share/wesnoth/images/tools/magenta_team_color_palette.png
 share/wesnoth/images/wesnoth-icon-small.png
+share/wesnoth/l10n-track
 share/wesnoth/sounds/README
 share/wesnoth/sounds/arrive.wav
 share/wesnoth/sounds/bell.wav
@@ -8377,6 +9400,7 @@ share/wesnoth/sounds/timer.wav
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-httt.mo
@@ -8399,6 +9423,7 @@ share/wesnoth/translations/af/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-httt.mo
@@ -8421,6 +9446,7 @@ share/wesnoth/translations/ar/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-httt.mo
@@ -8443,6 +9469,7 @@ share/wesnoth/translations/bg/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-dm.mo
 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
@@ -8465,6 +9492,7 @@ share/wesnoth/translations/ca/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-httt.mo
@@ -8487,6 +9515,7 @@ share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-dm.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
@@ -8509,6 +9538,7 @@ share/wesnoth/translations/cs/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-dm.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
@@ -8531,6 +9561,7 @@ share/wesnoth/translations/da/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-dm.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
@@ -8553,6 +9584,7 @@ share/wesnoth/translations/de/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/el/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-httt.mo
@@ -8572,9 +9604,33 @@ share/wesnoth/translations/el/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-anl.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-aoi.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-dm.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-l.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-low.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-multiplayer.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-nr.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-tb.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-test.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-thot.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-tsg.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-tutorial.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-units.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-utbs.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-httt.mo
@@ -8597,6 +9653,7 @@ share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-httt.mo
@@ -8619,6 +9676,7 @@ share/wesnoth/translations/eo/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-dm.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
@@ -8641,6 +9699,7 @@ share/wesnoth/translations/es/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/et/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-httt.mo
@@ -8663,6 +9722,7 @@ share/wesnoth/translations/et/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-dm.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
@@ -8685,6 +9745,7 @@ share/wesnoth/translations/eu/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-dm.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
@@ -8707,6 +9768,7 @@ share/wesnoth/translations/fi/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-dm.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
@@ -8729,6 +9791,7 @@ share/wesnoth/translations/fr/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-httt.mo
@@ -8751,6 +9814,7 @@ share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-httt.mo
@@ -8773,6 +9837,7 @@ share/wesnoth/translations/gl/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/he/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-httt.mo
@@ -8795,6 +9860,7 @@ share/wesnoth/translations/he/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-httt.mo
@@ -8817,6 +9883,7 @@ share/wesnoth/translations/hr/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-dm.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
@@ -8839,6 +9906,7 @@ share/wesnoth/translations/hu/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/id/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-httt.mo
@@ -8861,6 +9929,7 @@ share/wesnoth/translations/id/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/is/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-httt.mo
@@ -8883,6 +9952,7 @@ share/wesnoth/translations/is/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-dm.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
@@ -8905,6 +9975,7 @@ share/wesnoth/translations/it/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-httt.mo
@@ -8927,6 +9998,7 @@ share/wesnoth/translations/ja/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-httt.mo
@@ -8949,6 +10021,7 @@ share/wesnoth/translations/ko/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-httt.mo
@@ -8971,6 +10044,7 @@ share/wesnoth/translations/la/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-httt.mo
@@ -8993,6 +10067,7 @@ share/wesnoth/translations/lt/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-httt.mo
@@ -9015,6 +10090,7 @@ share/wesnoth/translations/lv/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-httt.mo
@@ -9037,6 +10113,7 @@ share/wesnoth/translations/mk/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-httt.mo
@@ -9059,6 +10136,7 @@ share/wesnoth/translations/mr/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-httt.mo
@@ -9081,6 +10159,7 @@ share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-dm.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
@@ -9103,6 +10182,7 @@ share/wesnoth/translations/nl/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-dm.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
@@ -9125,6 +10205,7 @@ share/wesnoth/translations/pl/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-httt.mo
@@ -9147,6 +10228,7 @@ share/wesnoth/translations/pt/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-dm.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
@@ -9169,6 +10251,7 @@ share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-httt.mo
@@ -9191,6 +10274,7 @@ share/wesnoth/translations/racv/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-httt.mo
@@ -9213,6 +10297,7 @@ share/wesnoth/translations/ro/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-dm.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
@@ -9235,6 +10320,7 @@ share/wesnoth/translations/ru/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-dm.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
@@ -9257,6 +10343,7 @@ share/wesnoth/translations/sk/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-dm.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
@@ -9279,6 +10366,7 @@ share/wesnoth/translations/sl/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-httt.mo
@@ -9298,9 +10386,56 @@ share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-anl.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-aoi.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-dm.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-l.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-low.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-multiplayer.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-nr.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-tb.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-test.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-thot.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-tsg.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-tutorial.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-units.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-utbs.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-anl.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-aoi.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-dm.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-l.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-low.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-multiplayer.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-nr.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-tb.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-test.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-thot.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-tsg.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-tutorial.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-units.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-utbs.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-httt.mo
@@ -9323,6 +10458,7 @@ share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-dm.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
@@ -9345,6 +10481,7 @@ share/wesnoth/translations/sv/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-httt.mo
@@ -9367,6 +10504,7 @@ share/wesnoth/translations/tl/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-httt.mo
@@ -9386,9 +10524,33 @@ share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-anl.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-aoi.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-dm.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-l.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-low.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-multiplayer.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-nr.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-tb.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-test.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-thot.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-tsg.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-tutorial.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-units.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-utbs.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-httt.mo
@@ -9411,6 +10573,7 @@ share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-aoi.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-dm.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-editor.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-ei.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-httt.mo
@@ -9430,4 +10593,3 @@ share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth.mo
-@pkgdir var/run/wesnothd
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 17e4fcba4f1..8d3ecca8a49 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.37 2009/07/18 14:02:24 wiz Exp $
+$NetBSD: distinfo,v 1.38 2010/08/28 20:08:40 adam Exp $
 
-SHA1 (wesnoth-1.6.4.tar.bz2) = 653c3797d1d3a4cd72addcea7dfc63216b30ffe0
-RMD160 (wesnoth-1.6.4.tar.bz2) = 300b6c89af6260628a404bf77607d3782ff83e9c
-Size (wesnoth-1.6.4.tar.bz2) = 229852077 bytes
-SHA1 (patch-aa) = 1116614ffff2c00a9ab178617eb14cc2c7c89142
-SHA1 (patch-ab) = a57f2d6656c7ac75d92055f4b6198aecc6fd243b
-SHA1 (patch-ac) = 26f535c853163749597e82ead94263f3ac64acc4
-SHA1 (patch-ad) = e2ad09e5961969f62538c0015653175af45bd61d
-SHA1 (patch-ae) = 76b7dc4e7d8dc9dac9464da5122edd801df8a752
-SHA1 (patch-af) = eaab066899206873d617da13d7fa8d3b566cff6d
-SHA1 (patch-ag) = 4eab46309e8ee2445d9d36ab052e458353837eba
+SHA1 (wesnoth-1.8.4.tar.bz2) = 30b82e06523f9a82b770a6fc4e2d4251bd358eca
+RMD160 (wesnoth-1.8.4.tar.bz2) = 86b6f6ca39cf87134d89e989ed20840836aeac28
+Size (wesnoth-1.8.4.tar.bz2) = 300557790 bytes
+SHA1 (patch-aa) = 363dead4e4a6974db5a2d71a460e60404cc1246a
+SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18
+SHA1 (patch-af) = d3554b1c164ff95ee2b86c17990ed236f0e00c32
+SHA1 (patch-ag) = f87094daa3a03b2a56ab4d729c92b98f13ff8a38
+SHA1 (patch-ah) = ca06ab21724812290c4f4785cfbd42d3406202fb
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa
index c046f5b0a38..1ff008a6d9b 100644
--- a/games/wesnoth/patches/patch-aa
+++ b/games/wesnoth/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.12 2009/03/30 09:48:53 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2010/08/28 20:08:40 adam Exp $
 
-http://gna.org/bugs/?13293
-
---- utils/update_unit_tree.orig	2008-04-10 16:14:11.000000000 +0000
-+++ utils/update_unit_tree
-@@ -40,7 +40,7 @@ fi
- #echo 'svn update...'
- #svn update
- #svn status
--if [ "$VERSION" == "trunk"]; then
-+if [ "$VERSION" = "trunk"]; then
- 	data/tools/wmlunits -d data/ -o $SITE/temp || exit 1
- 	rm -rf $SITE/$VERSION
- 	# move the generated files to their proper place
+--- configure.ac.orig	2010-08-28 17:03:00.000000000 +0000
++++ configure.ac
+@@ -111,7 +111,7 @@ then
+ #	CFLAGS="-Werror -Wno-unused -Wno-sign-compare $CFLAGS"
+ 
+ 	# The current networking code breaks strict aliasing in g++ 4.5.
+-	CXXFLAGS="-Werror -Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
++	CXXFLAGS="-Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
+ fi
+ 
+ # Make tests default in svn version
diff --git a/games/wesnoth/patches/patch-ab b/games/wesnoth/patches/patch-ab
deleted file mode 100644
index e8e58e2fbdb..00000000000
--- a/games/wesnoth/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2009/03/30 09:48:53 wiz Exp $
-
-http://gna.org/bugs/?13293
-
---- src/Makefile.in.orig	2009-03-18 16:51:06.000000000 +0000
-+++ src/Makefile.in
-@@ -1884,7 +1884,7 @@ uninstall-am: uninstall-binPROGRAMS unin
- game_config.o: revision.hpp 
- .PRECIOUS: revision.hpp
- revision.hpp: FORCE
--	if [ "$(REVISION)" == "" ] || [ "$(REVISION)" == "exported" ]; then echo '' >/tmp/westemp$$$$; \
-+	if [ "$(REVISION)" = "" ] || [ "$(REVISION)" = "exported" ]; then echo '' >/tmp/westemp$$$$; \
- 	else echo '#define REVISION    "$(REVISION)"' >/tmp/westemp$$$$; fi;\
- 	if cmp -s revision.hpp /tmp/westemp$$$$ 2>/dev/null; then :; else cp /tmp/westemp$$$$ revision.hpp; fi; \
- 	if [ -e /tmp/westemp$$$$ ]; then rm /tmp/westemp$$$$; fi
diff --git a/games/wesnoth/patches/patch-ac b/games/wesnoth/patches/patch-ac
deleted file mode 100644
index d64154366b1..00000000000
--- a/games/wesnoth/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2009/03/30 09:48:53 wiz Exp $
-
-http://gna.org/bugs/?13291
-
---- src/multiplayer_connect.cpp.orig	2009-02-23 07:05:50.000000000 +0000
-+++ src/multiplayer_connect.cpp
-@@ -675,6 +675,7 @@ config connect::side::get_config() const
- 			break;
- 		case CNTR_LAST:
- 		default:
-+			description = N_("(empty)");
- 			assert(false);
- 			break;
- 		}
diff --git a/games/wesnoth/patches/patch-ad b/games/wesnoth/patches/patch-ad
deleted file mode 100644
index 4b0ec886dff..00000000000
--- a/games/wesnoth/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2009/03/30 09:48:53 wiz Exp $
-
-http://gna.org/bugs/?13292
-
---- Makefile.in.orig	2009-03-18 16:51:06.000000000 +0000
-+++ Makefile.in
-@@ -279,7 +279,7 @@ SUBDIRS = po m4 src doc $(ISUBDIRS)
- bin_SCRIPTS = 
- 
- # Ignore junk -- object files, editor backup files, wmllint backup files.
--findfilterflags = ! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -wholename "data/test/*" \)
-+findfilterflags = ! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -regex "data/test/.*" \)
- 
- # List all datafiles, ignoring junk
- finddata = (cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print )
diff --git a/games/wesnoth/patches/patch-ae b/games/wesnoth/patches/patch-ae
index 069f8b69ed0..86baf143909 100644
--- a/games/wesnoth/patches/patch-ae
+++ b/games/wesnoth/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.5 2009/04/22 19:29:26 hasso Exp $
+$NetBSD: patch-ae,v 1.6 2010/08/28 20:08:40 adam Exp $
 
---- src/network_worker.cpp.orig	2009-04-13 13:17:34 +0300
-+++ src/network_worker.cpp	2009-04-13 13:18:38 +0300
-@@ -36,6 +36,10 @@
- #include <cerrno>
+--- src/network_worker.cpp.orig	2010-01-01 13:16:49.000000000 +0000
++++ src/network_worker.cpp
+@@ -37,6 +37,10 @@
  #include <deque>
+ #include <sstream>
  
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#undef HAVE_SENDFILE
diff --git a/games/wesnoth/patches/patch-af b/games/wesnoth/patches/patch-af
index bdbc674b8ef..b0bdce9a51d 100644
--- a/games/wesnoth/patches/patch-af
+++ b/games/wesnoth/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.3 2009/04/22 19:29:26 hasso Exp $
+$NetBSD: patch-af,v 1.4 2010/08/28 20:08:40 adam Exp $
 
---- src/preferences.cpp.orig	2009-04-13 06:03:51 +0300
-+++ src/preferences.cpp	2009-04-13 06:04:17 +0300
-@@ -30,6 +30,7 @@
+--- src/preferences.cpp.orig	2010-01-01 13:16:49.000000000 +0000
++++ src/preferences.cpp
+@@ -31,6 +31,7 @@
  #include "serialization/parser.hpp"
  
  #include <sys/stat.h> // for setting the permissions of the preferences file
 +#include <unistd.h>
  
- namespace {
- 
+ static lg::log_domain log_filesystem("filesystem");
+ #define ERR_FS LOG_STREAM(err, log_filesystem)
diff --git a/games/wesnoth/patches/patch-ag b/games/wesnoth/patches/patch-ag
index 8cb479297fc..b02bfa6efc8 100644
--- a/games/wesnoth/patches/patch-ag
+++ b/games/wesnoth/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2009/04/22 19:29:26 hasso Exp $
+$NetBSD: patch-ag,v 1.4 2010/08/28 20:08:40 adam Exp $
 
---- src/clipboard.cpp.orig	2009-04-13 05:58:47 +0300
-+++ src/clipboard.cpp	2009-04-13 13:29:27 +0300
-@@ -25,6 +25,8 @@
+--- src/clipboard.cpp.orig	2010-02-06 10:50:29.000000000 +0000
++++ src/clipboard.cpp
+@@ -26,6 +26,8 @@
  
  #include "SDL_syswm.h"
  
diff --git a/games/wesnoth/patches/patch-ah b/games/wesnoth/patches/patch-ah
new file mode 100644
index 00000000000..619594c4ffa
--- /dev/null
+++ b/games/wesnoth/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/08/28 20:08:40 adam Exp $
+
+--- m4/boost.m4.orig	2010-05-27 07:42:52.000000000 +0000
++++ m4/boost.m4
+@@ -463,7 +463,7 @@ AC_DEFUN([BOOST_GRAPH],
+ AC_DEFUN([BOOST_IOSTREAMS],
+ [BOOST_FIND_LIB([iostreams], [$1],
+                 [boost/iostreams/device/file_descriptor.hpp],
+-                [boost::iostreams::file_descriptor fd(0); fd.close();])
++                [boost::iostreams::file_descriptor fd("/dev/null"); fd.close();])
+ ])# BOOST_IOSTREAMS
+ 
+