- Update to version 0.7

PR:		ports/64595
Submitted by:	maintainer

8 files changed, 732 insertions, 56 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 1a605b561e79..ea1607aca36c 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.wesnoth.org/files/
 
@@ -19,7 +18,7 @@ USE_GNOME=	gnometarget
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
-MAN6=		wesnoth.6 wesnothd.6
+MAN6=		wesnoth.6 wesnoth_editor.6 wesnothd.6
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index 8b9c9c56e022..7f8d69def59a 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (wesnoth-0.6.1.tar.gz) = 716f3507d044318b63c907134356708c
-SIZE (wesnoth-0.6.1.tar.gz) = 11616064
+MD5 (wesnoth-0.7.tar.gz) = 8c38f71db9c689148c300474992eb260
+SIZE (wesnoth-0.7.tar.gz) = 17497561
diff --git a/games/wesnoth-devel/files/patch-src::widgets::menu.cpp b/games/wesnoth-devel/files/patch-src::widgets::menu.cpp
deleted file mode 100644
index 7e8eddbfad3e..000000000000
--- a/games/wesnoth-devel/files/patch-src::widgets::menu.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/widgets/menu.cpp.orig	Thu Jan 29 22:23:06 2004
-+++ src/widgets/menu.cpp	Thu Jan 29 22:23:49 2004
-@@ -191,8 +191,8 @@
- 			x = event.button.x;
- 			y = event.button.y;
- 		} else {
--			x = reinterpret_cast<int>(event.user.data1);
--			y = reinterpret_cast<int>(event.user.data2);
-+			x = (int)event.user.data1;
-+			y = (int)event.user.data2;
- 		}
- 
- 		const int item = hit(x,y);
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index beb15ec7535d..d768e1fd835e 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -19,6 +19,7 @@ share/wesnoth/data/maps/kingatsea
 share/wesnoth/data/maps/map-test
 share/wesnoth/data/maps/map-threerivers
 share/wesnoth/data/maps/map-tutorial
+share/wesnoth/data/maps/map-tutorial2
 share/wesnoth/data/maps/map0
 share/wesnoth/data/maps/map0-bak
 share/wesnoth/data/maps/map0b
@@ -36,30 +37,41 @@ share/wesnoth/data/maps/map6
 share/wesnoth/data/maps/map7
 share/wesnoth/data/maps/map8
 share/wesnoth/data/maps/map9
+share/wesnoth/data/maps/north-elves
 share/wesnoth/data/maps/north-winter
 share/wesnoth/data/maps/sceptre
 share/wesnoth/data/maps/snowplains
 share/wesnoth/data/maps/swampland
+share/wesnoth/data/maps/undeadbook
+share/wesnoth/data/maps/undeadtower
 share/wesnoth/data/maps/undmap1
 share/wesnoth/data/maps/undmap2
+share/wesnoth/data/maps/undmap3
+share/wesnoth/data/maps/undmapbrother
+share/wesnoth/data/maps/undmapmages
+share/wesnoth/data/maps/undmapskull
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
-share/wesnoth/data/ranmap.cfg
 share/wesnoth/data/sample_translation.cfg
 share/wesnoth/data/scenario-test.cfg
 share/wesnoth/data/scenarios/A_Choice_Must_Be_Made.cfg
 share/wesnoth/data/scenarios/Bay_of_Pearls.cfg
 share/wesnoth/data/scenarios/Blackwater_Port.cfg
 share/wesnoth/data/scenarios/Brother_Against_Brother.cfg
+share/wesnoth/data/scenarios/Crelanus_Book.cfg
 share/wesnoth/data/scenarios/Crossroads.cfg
 share/wesnoth/data/scenarios/Dwarven_Doors.cfg
+share/wesnoth/data/scenarios/Elven_Council.cfg
 share/wesnoth/data/scenarios/Elves_Besieged.cfg
 share/wesnoth/data/scenarios/Ford_of_Abez.cfg
 share/wesnoth/data/scenarios/Gryphon_Mountain.cfg
 share/wesnoth/data/scenarios/Hasty_Alliance.cfg
 share/wesnoth/data/scenarios/High_King_at_Sea.cfg
+share/wesnoth/data/scenarios/Home_North_Elves.cfg
+share/wesnoth/data/scenarios/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/Isle_of_Anduin.cfg
 share/wesnoth/data/scenarios/Isle_of_the_Damned.cfg
+share/wesnoth/data/scenarios/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/Mountain_Pass.cfg
 share/wesnoth/data/scenarios/Muff_Malal_Peninsula.cfg
 share/wesnoth/data/scenarios/Northern_Winter.cfg
@@ -67,30 +79,40 @@ share/wesnoth/data/scenarios/Plunging_Into_the_Darkness.cfg
 share/wesnoth/data/scenarios/Princess_of_Wesnoth.cfg
 share/wesnoth/data/scenarios/Random_Scenario.cfg
 share/wesnoth/data/scenarios/Sceptre.cfg
-share/wesnoth/data/scenarios/Siege_to_Elefansar.cfg
 share/wesnoth/data/scenarios/Snow_Plains.cfg
 share/wesnoth/data/scenarios/Swamp_Of_Dread.cfg
-share/wesnoth/data/scenarios/The_Liberation_Front.cfg
 share/wesnoth/data/scenarios/The_Lost_General.cfg
+share/wesnoth/data/scenarios/The_Siege_of_Elensefar.cfg
 share/wesnoth/data/scenarios/The_Skull_of_Agarash.cfg
 share/wesnoth/data/scenarios/Valley_of_Death.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain.cfg
+share/wesnoth/data/terrain_generator.cfg
+share/wesnoth/data/themes/default.cfg
+share/wesnoth/data/translations/brazilian.cfg
 share/wesnoth/data/translations/danish.cfg
 share/wesnoth/data/translations/dutch.cfg
 share/wesnoth/data/translations/english.cfg
+share/wesnoth/data/translations/finnish.cfg
 share/wesnoth/data/translations/french.cfg
 share/wesnoth/data/translations/german.cfg
 share/wesnoth/data/translations/hungarian.cfg
 share/wesnoth/data/translations/italian.cfg
+share/wesnoth/data/translations/norwegian.cfg
 share/wesnoth/data/translations/polish.cfg
+share/wesnoth/data/translations/portuguesebr.cfg
+share/wesnoth/data/translations/slovak.cfg
 share/wesnoth/data/translations/spanish.cfg
+share/wesnoth/data/translations/swedish.cfg
 share/wesnoth/data/tutorial.cfg
+share/wesnoth/data/tutorial2.cfg
 share/wesnoth/data/units/Ancient_Lich.cfg
 share/wesnoth/data/units/Arch_Mage.cfg
 share/wesnoth/data/units/Assassin.cfg
+share/wesnoth/data/units/Bandit.cfg
 share/wesnoth/data/units/Blood_Bat.cfg
 share/wesnoth/data/units/Bone_Shooter.cfg
+share/wesnoth/data/units/Bowman.cfg
 share/wesnoth/data/units/Cavalry.cfg
 share/wesnoth/data/units/Cave_Spider.cfg
 share/wesnoth/data/units/Chocobone.cfg
@@ -98,7 +120,10 @@ share/wesnoth/data/units/Commander.cfg
 share/wesnoth/data/units/Cuttle_Fish.cfg
 share/wesnoth/data/units/Dark_Adept.cfg
 share/wesnoth/data/units/Dark_Apprentice.cfg
+share/wesnoth/data/units/Dark_Spirit.cfg
 share/wesnoth/data/units/Death_Knight.cfg
+share/wesnoth/data/units/Deathmaster.cfg
+share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Dragoon.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
@@ -127,6 +152,7 @@ share/wesnoth/data/units/Elvish_Shyde.cfg
 share/wesnoth/data/units/Evil_Necromancer.cfg
 share/wesnoth/data/units/Fencer.cfg
 share/wesnoth/data/units/Fighter.cfg
+share/wesnoth/data/units/Footpad.cfg
 share/wesnoth/data/units/Galleon.cfg
 share/wesnoth/data/units/General.cfg
 share/wesnoth/data/units/Ghost.cfg
@@ -138,27 +164,35 @@ share/wesnoth/data/units/Gryphon.cfg
 share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
+share/wesnoth/data/units/Heavy_Infantryman.cfg
 share/wesnoth/data/units/Horseman.cfg
+share/wesnoth/data/units/Initiate.cfg
 share/wesnoth/data/units/Knight.cfg
 share/wesnoth/data/units/Lich.cfg
 share/wesnoth/data/units/Lieutenant.cfg
+share/wesnoth/data/units/Longbowman.cfg
 share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
 share/wesnoth/data/units/Mage_of_Light.cfg
+share/wesnoth/data/units/Master_Bowman.cfg
 share/wesnoth/data/units/Merman.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
+share/wesnoth/data/units/Nightgaunt.cfg
 share/wesnoth/data/units/Ogre.cfg
 share/wesnoth/data/units/Orcish_Archer.cfg
 share/wesnoth/data/units/Orcish_Assassin.cfg
 share/wesnoth/data/units/Orcish_Crossbow.cfg
+share/wesnoth/data/units/Orcish_Crossbowman.cfg
 share/wesnoth/data/units/Orcish_Grunt.cfg
 share/wesnoth/data/units/Orcish_Slayer.cfg
 share/wesnoth/data/units/Orcish_Warlord.cfg
 share/wesnoth/data/units/Orcish_Warrior.cfg
+share/wesnoth/data/units/Outlaw.cfg
 share/wesnoth/data/units/Paladin.cfg
 share/wesnoth/data/units/Pikeman.cfg
+share/wesnoth/data/units/Poacher.cfg
 share/wesnoth/data/units/Princess.cfg
 share/wesnoth/data/units/Red_Mage.cfg
 share/wesnoth/data/units/Revenant.cfg
@@ -167,13 +201,18 @@ share/wesnoth/data/units/Royal_Guard.cfg
 share/wesnoth/data/units/Sea_Hag.cfg
 share/wesnoth/data/units/Sea_Orc.cfg
 share/wesnoth/data/units/Sea_Serpent.cfg
+share/wesnoth/data/units/Shadow.cfg
 share/wesnoth/data/units/Shock_Trooper.cfg
 share/wesnoth/data/units/Skeleton.cfg
 share/wesnoth/data/units/Skeleton_Archer.cfg
 share/wesnoth/data/units/Sleeping_Gryphon.cfg
 share/wesnoth/data/units/Spearman.cfg
+share/wesnoth/data/units/Spectre.cfg
 share/wesnoth/data/units/Swordsman.cfg
 share/wesnoth/data/units/Thief.cfg
+share/wesnoth/data/units/Thug.cfg
+share/wesnoth/data/units/Trapper.cfg
+share/wesnoth/data/units/Triton.cfg
 share/wesnoth/data/units/Troll.cfg
 share/wesnoth/data/units/Troll_Warrior.cfg
 share/wesnoth/data/units/Troll_Whelp.cfg
@@ -182,6 +221,7 @@ share/wesnoth/data/units/Walking_Corpse.cfg
 share/wesnoth/data/units/White_Mage.cfg
 share/wesnoth/data/units/Wolf_Rider.cfg
 share/wesnoth/data/units/Wraith.cfg
+share/wesnoth/data/units/Youth.cfg
 share/wesnoth/data/utils.cfg
 share/wesnoth/fonts/Vera.ttf
 share/wesnoth/images/Afternoon.png
@@ -193,6 +233,8 @@ share/wesnoth/images/Morning.png
 share/wesnoth/images/Night.png
 share/wesnoth/images/SecondWatch.png
 share/wesnoth/images/ally-energy.png
+share/wesnoth/images/arch-mage-attack2.png
+share/wesnoth/images/arch-mage-defend.png
 share/wesnoth/images/arch-mage.png
 share/wesnoth/images/assassin.png
 share/wesnoth/images/bone-n.png
@@ -201,22 +243,44 @@ share/wesnoth/images/bullet.png
 share/wesnoth/images/buttons/button-active.png
 share/wesnoth/images/buttons/button-pressed.png
 share/wesnoth/images/buttons/button.png
+share/wesnoth/images/buttons/checkbox-active-pressed.png
+share/wesnoth/images/buttons/checkbox-active.png
+share/wesnoth/images/buttons/checkbox-pressed.png
+share/wesnoth/images/buttons/checkbox.png
 share/wesnoth/images/buttons/downarrow-button-active.png
 share/wesnoth/images/buttons/downarrow-button-pressed.png
 share/wesnoth/images/buttons/downarrow-button.png
+share/wesnoth/images/buttons/lite-active.png
+share/wesnoth/images/buttons/lite-pressed.png
+share/wesnoth/images/buttons/lite.png
+share/wesnoth/images/buttons/scrollbottom-active.png
+share/wesnoth/images/buttons/scrollbottom.png
+share/wesnoth/images/buttons/scrollgroove-bottom.png
+share/wesnoth/images/buttons/scrollgroove-mid.png
+share/wesnoth/images/buttons/scrollgroove-top.png
+share/wesnoth/images/buttons/scrollmid-active.png
+share/wesnoth/images/buttons/scrollmid.png
+share/wesnoth/images/buttons/scrolltop-active.png
+share/wesnoth/images/buttons/scrolltop.png
 share/wesnoth/images/buttons/slider-selected.png
 share/wesnoth/images/buttons/slider.png
 share/wesnoth/images/buttons/uparrow-button-active.png
 share/wesnoth/images/buttons/uparrow-button-pressed.png
 share/wesnoth/images/buttons/uparrow-button.png
 share/wesnoth/images/cavespider.png
-share/wesnoth/images/cross.png
+share/wesnoth/images/cockatrice-attack1.png
+share/wesnoth/images/cockatrice-attack2.png
+share/wesnoth/images/cockatrice.png
 share/wesnoth/images/cuttlefish.png
 share/wesnoth/images/darkmissile-n.png
 share/wesnoth/images/darkmissile-ne.png
 share/wesnoth/images/dwarf-berserker.png
+share/wesnoth/images/dwarf-fighter-attack.png
 share/wesnoth/images/dwarf-fighter-defend.png
 share/wesnoth/images/dwarf-fighter.png
+share/wesnoth/images/dwarf-lord-attack.png
+share/wesnoth/images/dwarf-lord-defend.png
+share/wesnoth/images/dwarf-lord.png
 share/wesnoth/images/dwarf-runemaster-attack.png
 share/wesnoth/images/dwarf-runemaster-defend.png
 share/wesnoth/images/dwarf-runemaster.png
@@ -224,6 +288,8 @@ share/wesnoth/images/dwarf-thunderer-attack.png
 share/wesnoth/images/dwarf-thunderer-attack1.png
 share/wesnoth/images/dwarf-thunderer-defend.png
 share/wesnoth/images/dwarf-thunderer.png
+share/wesnoth/images/dwarf-warrior-attack.png
+share/wesnoth/images/dwarf-warrior-defend.png
 share/wesnoth/images/dwarf-warrior.png
 share/wesnoth/images/elder-mage-attack.png
 share/wesnoth/images/elder-mage-defend.png
@@ -231,17 +297,27 @@ share/wesnoth/images/elder-mage.png
 share/wesnoth/images/elvish-archer-attack.png
 share/wesnoth/images/elvish-archer-attack1.png
 share/wesnoth/images/elvish-archer-attack2.png
+share/wesnoth/images/elvish-archer-bow-defend.png
+share/wesnoth/images/elvish-archer-defend.png
 share/wesnoth/images/elvish-archer.png
+share/wesnoth/images/elvish-avenger-attack.png
+share/wesnoth/images/elvish-avenger-attack1.png
+share/wesnoth/images/elvish-avenger-attack2.png
+share/wesnoth/images/elvish-avenger-bow-defend.png
+share/wesnoth/images/elvish-avenger-bow.png
+share/wesnoth/images/elvish-avenger-defend.png
 share/wesnoth/images/elvish-avenger.png
 share/wesnoth/images/elvish-captain-attack.png
 share/wesnoth/images/elvish-captain-bow-attack1.png
 share/wesnoth/images/elvish-captain-bow-attack2.png
+share/wesnoth/images/elvish-captain-bow-defend.png
 share/wesnoth/images/elvish-captain-bow.png
 share/wesnoth/images/elvish-captain-defend.png
 share/wesnoth/images/elvish-captain.png
 share/wesnoth/images/elvish-champion-attack.png
 share/wesnoth/images/elvish-champion-defend.png
 share/wesnoth/images/elvish-champion.png
+share/wesnoth/images/elvish-druid-defend.png
 share/wesnoth/images/elvish-druid.png
 share/wesnoth/images/elvish-fighter-attack.png
 share/wesnoth/images/elvish-fighter-bow-attack1.png
@@ -253,19 +329,34 @@ share/wesnoth/images/elvish-fighter.png
 share/wesnoth/images/elvish-hero-attack.png
 share/wesnoth/images/elvish-hero.png
 share/wesnoth/images/elvish-lord.png
+share/wesnoth/images/elvish-marksman-attack.png
+share/wesnoth/images/elvish-marksman-attack1.png
+share/wesnoth/images/elvish-marksman-attack2.png
+share/wesnoth/images/elvish-marksman-bow-defend.png
 share/wesnoth/images/elvish-marksman.png
+share/wesnoth/images/elvish-marshal-attack.png
+share/wesnoth/images/elvish-marshal-bow.png
+share/wesnoth/images/elvish-marshal-defend.png
 share/wesnoth/images/elvish-marshal.png
+share/wesnoth/images/elvish-outrider-attack.png
+share/wesnoth/images/elvish-outrider-defend.png
 share/wesnoth/images/elvish-outrider.png
 share/wesnoth/images/elvish-ranger-attack.png
 share/wesnoth/images/elvish-ranger-attack1.png
 share/wesnoth/images/elvish-ranger-attack2.png
+share/wesnoth/images/elvish-ranger-bow-defend.png
+share/wesnoth/images/elvish-ranger-defend.png
 share/wesnoth/images/elvish-ranger.png
 share/wesnoth/images/elvish-scout-attack.png
+share/wesnoth/images/elvish-scout-defend.png
 share/wesnoth/images/elvish-scout.png
 share/wesnoth/images/elvish-shaman-attack.png
 share/wesnoth/images/elvish-shaman-attack2.png
 share/wesnoth/images/elvish-shaman-defend.png
 share/wesnoth/images/elvish-shaman.png
+share/wesnoth/images/elvish-sharpshooter-attack.png
+share/wesnoth/images/elvish-sharpshooter-attack1.png
+share/wesnoth/images/elvish-sharpshooter-attack2.png
 share/wesnoth/images/elvish-sharpshooter.png
 share/wesnoth/images/elvish-shyde.png
 share/wesnoth/images/enemy-energy.png
@@ -284,35 +375,93 @@ share/wesnoth/images/gryphon-sleeping.png
 share/wesnoth/images/gryphon.png
 share/wesnoth/images/horseman-attack.png
 share/wesnoth/images/horseman.png
+share/wesnoth/images/human-battleprincess.png
+share/wesnoth/images/human-bowman-attack-sword.png
+share/wesnoth/images/human-bowman-attack1.png
+share/wesnoth/images/human-bowman-attack2.png
+share/wesnoth/images/human-bowman-defend.png
+share/wesnoth/images/human-bowman.png
 share/wesnoth/images/human-dragoon.png
 share/wesnoth/images/human-duelist-defend.png
 share/wesnoth/images/human-duelist.png
 share/wesnoth/images/human-fencer-defend.png
 share/wesnoth/images/human-fencer.png
+share/wesnoth/images/human-general-defend.png
 share/wesnoth/images/human-general.png
 share/wesnoth/images/human-halbardier.png
+share/wesnoth/images/human-heavyinfantry-attack.png
+share/wesnoth/images/human-heavyinfantry-defend.png
 share/wesnoth/images/human-heavyinfantry.png
 share/wesnoth/images/human-lieutenant.png
+share/wesnoth/images/human-longbowman-attack-sword.png
+share/wesnoth/images/human-longbowman-attack1.png
+share/wesnoth/images/human-longbowman-attack2.png
+share/wesnoth/images/human-longbowman-defend-close.png
+share/wesnoth/images/human-longbowman-defend.png
+share/wesnoth/images/human-longbowman.png
+share/wesnoth/images/human-masterbowman.png
 share/wesnoth/images/human-pikeman.png
+share/wesnoth/images/human-princess-attack.png
+share/wesnoth/images/human-princess-defend.png
 share/wesnoth/images/human-princess.png
 share/wesnoth/images/human-queen.png
+share/wesnoth/images/human-royalguard-defend.png
 share/wesnoth/images/human-royalguard.png
+share/wesnoth/images/human-scout-attack.png
 share/wesnoth/images/human-scout.png
+share/wesnoth/images/human-shocktrooper-attack.png
 share/wesnoth/images/human-shocktrooper.png
 share/wesnoth/images/human-spearman-attack.png
 share/wesnoth/images/human-spearman-attack2.png
 share/wesnoth/images/human-spearman-defend.png
 share/wesnoth/images/human-spearman.png
+share/wesnoth/images/human-swordman-attack.png
+share/wesnoth/images/human-swordman-defend.png
 share/wesnoth/images/human-swordman.png
-share/wesnoth/images/icon.png
 share/wesnoth/images/ink.png
-share/wesnoth/images/item-flamesword.png
-share/wesnoth/images/item-holywater.png
-share/wesnoth/images/item-sceptreoffire.png
+share/wesnoth/images/item-ball1.png
+share/wesnoth/images/item-ball2.png
+share/wesnoth/images/item-barrel.png
+share/wesnoth/images/item-book1.png
+share/wesnoth/images/item-book2.png
+share/wesnoth/images/item-book3.png
+share/wesnoth/images/item-book4.png
+share/wesnoth/images/item-box.png
+share/wesnoth/images/item-dragonstatue.png
+share/wesnoth/images/item-flower1.png
+share/wesnoth/images/item-flower2.png
+share/wesnoth/images/item-flower3.png
+share/wesnoth/images/item-flower4.png
+share/wesnoth/images/item-leanto.png
+share/wesnoth/images/item-monolith.png
+share/wesnoth/images/item-monolith1.png
+share/wesnoth/images/item-monolith2.png
+share/wesnoth/images/item-monolith3.png
+share/wesnoth/images/item-monolith4.png
+share/wesnoth/images/item-ornate1.png
+share/wesnoth/images/item-ornate2.png
+share/wesnoth/images/item-pine1.png
+share/wesnoth/images/item-pine2.png
+share/wesnoth/images/item-potion1.png
+share/wesnoth/images/item-potion2.png
+share/wesnoth/images/item-potion3.png
+share/wesnoth/images/item-potion4.png
+share/wesnoth/images/item-ring1.png
+share/wesnoth/images/item-ring2.png
+share/wesnoth/images/item-rock1.png
+share/wesnoth/images/item-rock2.png
+share/wesnoth/images/item-rock3.png
+share/wesnoth/images/item-rock4.png
+share/wesnoth/images/item-slab.png
+share/wesnoth/images/item-well.png
 share/wesnoth/images/knight.png
 share/wesnoth/images/konrad-commander-attack1.png
 share/wesnoth/images/konrad-commander-attack2.png
 share/wesnoth/images/konrad-commander.png
+share/wesnoth/images/konrad-fighter-attack.png
+share/wesnoth/images/konrad-fighter-defend.png
+share/wesnoth/images/konrad-fighter.png
+share/wesnoth/images/konrad-lord-attack.png
 share/wesnoth/images/konrad-lord.png
 share/wesnoth/images/konrad-young-attack.png
 share/wesnoth/images/konrad-young.png
@@ -325,28 +474,76 @@ share/wesnoth/images/mage-attack3.png
 share/wesnoth/images/mage.png
 share/wesnoth/images/magicmissile-n.png
 share/wesnoth/images/magicmissile-ne.png
+share/wesnoth/images/merman-defend.png
+share/wesnoth/images/merman-king-attack.png
+share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
 share/wesnoth/images/merman.png
+share/wesnoth/images/misc/axe.png
+share/wesnoth/images/misc/baneblade.png
+share/wesnoth/images/misc/battleaxe.png
+share/wesnoth/images/misc/blank.png
 share/wesnoth/images/misc/botleft-corner.png
 share/wesnoth/images/misc/botright-corner.png
+share/wesnoth/images/misc/bow.png
 share/wesnoth/images/misc/cage.png
 share/wesnoth/images/misc/character-box.png
 share/wesnoth/images/misc/chest.png
+share/wesnoth/images/misc/claws.png
+share/wesnoth/images/misc/club.png
 share/wesnoth/images/misc/compass-north.png
 share/wesnoth/images/misc/compass-south.png
 share/wesnoth/images/misc/cross.png
+share/wesnoth/images/misc/dagger.png
+share/wesnoth/images/misc/dark-missile.png
+share/wesnoth/images/misc/darkstaff.png
+share/wesnoth/images/misc/darts.png
 share/wesnoth/images/misc/delfador.png
+share/wesnoth/images/misc/disk.png
 share/wesnoth/images/misc/dot.png
+share/wesnoth/images/misc/druidstaff.png
+share/wesnoth/images/misc/entangle.png
+share/wesnoth/images/misc/fangs.png
+share/wesnoth/images/misc/fireball.png
+share/wesnoth/images/misc/fist.png
 share/wesnoth/images/misc/font8x8.png
 share/wesnoth/images/misc/foot-left-n.png
 share/wesnoth/images/misc/foot-left-nw.png
 share/wesnoth/images/misc/foot-right-n.png
 share/wesnoth/images/misc/foot-right-nw.png
+share/wesnoth/images/misc/frenzy.png
+share/wesnoth/images/misc/gold.png
+share/wesnoth/images/misc/halberd.png
+share/wesnoth/images/misc/hammer.png
+share/wesnoth/images/misc/hatchet.png
+share/wesnoth/images/misc/income.png
+share/wesnoth/images/misc/invisible.png
+share/wesnoth/images/misc/item-darktome.png
+share/wesnoth/images/misc/item-flamesword.png
+share/wesnoth/images/misc/item-healingpotion.png
+share/wesnoth/images/misc/item-holywater.png
+share/wesnoth/images/misc/item-sceptreoffire.png
+share/wesnoth/images/misc/item-staff.png
 share/wesnoth/images/misc/item-stormtrident.png
 share/wesnoth/images/misc/kalenz.png
+share/wesnoth/images/misc/knife.png
 share/wesnoth/images/misc/konrad.png
+share/wesnoth/images/misc/lance.png
+share/wesnoth/images/misc/lightingbolt.png
 share/wesnoth/images/misc/lisar.png
 share/wesnoth/images/misc/lobby.png
+share/wesnoth/images/misc/logo.png
+share/wesnoth/images/misc/longbow.png
+share/wesnoth/images/misc/mace.png
+share/wesnoth/images/misc/mainmenu-background.png
+share/wesnoth/images/misc/mainmenu-border-botleft.png
+share/wesnoth/images/misc/mainmenu-border-botright.png
+share/wesnoth/images/misc/mainmenu-border-bottom.png
+share/wesnoth/images/misc/mainmenu-border-left.png
+share/wesnoth/images/misc/mainmenu-border-right.png
+share/wesnoth/images/misc/mainmenu-border-top.png
+share/wesnoth/images/misc/mainmenu-border-topleft.png
+share/wesnoth/images/misc/mainmenu-border-topright.png
 share/wesnoth/images/misc/map.png
 share/wesnoth/images/misc/menu-background.png
 share/wesnoth/images/misc/menu-border-botleft.png
@@ -357,9 +554,32 @@ share/wesnoth/images/misc/menu-border-right.png
 share/wesnoth/images/misc/menu-border-top.png
 share/wesnoth/images/misc/menu-border-topleft.png
 share/wesnoth/images/misc/menu-border-topright.png
+share/wesnoth/images/misc/menu2-background.png
+share/wesnoth/images/misc/menu2-border-botleft.png
+share/wesnoth/images/misc/menu2-border-botright.png
+share/wesnoth/images/misc/menu2-border-bottom.png
+share/wesnoth/images/misc/menu2-border-left.png
+share/wesnoth/images/misc/menu2-border-right.png
+share/wesnoth/images/misc/menu2-border-top.png
+share/wesnoth/images/misc/menu2-border-topleft.png
+share/wesnoth/images/misc/menu2-border-topright.png
+share/wesnoth/images/misc/missile.png
+share/wesnoth/images/misc/paladinsword.png
+share/wesnoth/images/misc/pike.png
+share/wesnoth/images/misc/poisoned.png
+share/wesnoth/images/misc/rapier.png
+share/wesnoth/images/misc/rightside-bg.png
 share/wesnoth/images/misc/rightside-bottom.png
 share/wesnoth/images/misc/rightside-editor.png
 share/wesnoth/images/misc/rightside.png
+share/wesnoth/images/misc/short-sword.png
+share/wesnoth/images/misc/sling.png
+share/wesnoth/images/misc/slowed.png
+share/wesnoth/images/misc/spear.png
+share/wesnoth/images/misc/staff.png
+share/wesnoth/images/misc/status-bg.png
+share/wesnoth/images/misc/story0a.png
+share/wesnoth/images/misc/story0b.png
 share/wesnoth/images/misc/story1.png
 share/wesnoth/images/misc/story2.png
 share/wesnoth/images/misc/story3.png
@@ -368,8 +588,30 @@ share/wesnoth/images/misc/story5.png
 share/wesnoth/images/misc/story6.png
 share/wesnoth/images/misc/story7.png
 share/wesnoth/images/misc/story8.png
+share/wesnoth/images/misc/story9.png
+share/wesnoth/images/misc/sword.png
+share/wesnoth/images/misc/tentacle.png
+share/wesnoth/images/misc/thorns.png
+share/wesnoth/images/misc/title.png
+share/wesnoth/images/misc/top-bg.png
 share/wesnoth/images/misc/topleft-corner.png
 share/wesnoth/images/misc/topright-corner.png
+share/wesnoth/images/misc/torch.png
+share/wesnoth/images/misc/trident.png
+share/wesnoth/images/misc/tutorial1.png
+share/wesnoth/images/misc/tutorial2.png
+share/wesnoth/images/misc/tutorial3.png
+share/wesnoth/images/misc/tutorial3b.png
+share/wesnoth/images/misc/tutorial4.png
+share/wesnoth/images/misc/tutorial5.png
+share/wesnoth/images/misc/tutorial6.png
+share/wesnoth/images/misc/tutorial7.png
+share/wesnoth/images/misc/units.png
+share/wesnoth/images/misc/upkeep.png
+share/wesnoth/images/misc/villages.png
+share/wesnoth/images/misc/waterspray.png
+share/wesnoth/images/misc/web.png
+share/wesnoth/images/misc/woodensword.png
 share/wesnoth/images/missile-n.png
 share/wesnoth/images/missile-ne.png
 share/wesnoth/images/missile-nw.png
@@ -381,14 +623,44 @@ share/wesnoth/images/missiledagger-n.png
 share/wesnoth/images/missiledagger-ne.png
 share/wesnoth/images/missilespear-n.png
 share/wesnoth/images/missilespear-ne.png
+share/wesnoth/images/missilestone.png
 share/wesnoth/images/moved-energy.png
+share/wesnoth/images/naga-defend.png
 share/wesnoth/images/naga.png
+share/wesnoth/images/neutral-bandit-attack.png
+share/wesnoth/images/neutral-bandit-defend.png
+share/wesnoth/images/neutral-bandit.png
+share/wesnoth/images/neutral-footpad-attack.png
+share/wesnoth/images/neutral-footpad-attack1.png
+share/wesnoth/images/neutral-footpad-attack2.png
+share/wesnoth/images/neutral-footpad-defend.png
+share/wesnoth/images/neutral-footpad.png
+share/wesnoth/images/neutral-outlaw-attack.png
+share/wesnoth/images/neutral-outlaw-attack1.png
+share/wesnoth/images/neutral-outlaw-attack2.png
+share/wesnoth/images/neutral-outlaw-defend.png
+share/wesnoth/images/neutral-outlaw.png
+share/wesnoth/images/neutral-poacher-attack.png
+share/wesnoth/images/neutral-poacher-attack1.png
+share/wesnoth/images/neutral-poacher-attack2.png
+share/wesnoth/images/neutral-poacher-defend.png
+share/wesnoth/images/neutral-poacher.png
+share/wesnoth/images/neutral-thug-attack.png
+share/wesnoth/images/neutral-thug-defend.png
+share/wesnoth/images/neutral-thug.png
+share/wesnoth/images/neutral-trapper-attack.png
+share/wesnoth/images/neutral-trapper-attack1.png
+share/wesnoth/images/neutral-trapper-attack2.png
+share/wesnoth/images/neutral-trapper-defend.png
+share/wesnoth/images/neutral-trapper.png
 share/wesnoth/images/ogre.png
 share/wesnoth/images/orc-archer-attack.png
 share/wesnoth/images/orc-archer-attack2.png
 share/wesnoth/images/orc-archer.png
+share/wesnoth/images/orc-assassin-attack.png
 share/wesnoth/images/orc-assassin.png
 share/wesnoth/images/orc-slayer.png
+share/wesnoth/images/orc-xbowman-attack.png
 share/wesnoth/images/orc-xbowman.png
 share/wesnoth/images/orcish-grunt-attack.png
 share/wesnoth/images/orcish-grunt-defend.png
@@ -399,10 +671,14 @@ share/wesnoth/images/orcish-warrior.png
 share/wesnoth/images/paladin.png
 share/wesnoth/images/partmoved-energy.png
 share/wesnoth/images/red-mage.png
+share/wesnoth/images/rogue-attack.png
+share/wesnoth/images/rogue-defend.png
 share/wesnoth/images/rogue.png
+share/wesnoth/images/sea-hag-defend.png
 share/wesnoth/images/sea-hag.png
 share/wesnoth/images/sea-orc.png
 share/wesnoth/images/seaserpent.png
+share/wesnoth/images/terrain/alpha.png
 share/wesnoth/images/terrain/bridge-n-s.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-se-nw.png
@@ -459,12 +735,22 @@ share/wesnoth/images/terrain/flag-neutral-sw.png
 share/wesnoth/images/terrain/flag-neutral.png
 share/wesnoth/images/terrain/flag-snow-neutral.png
 share/wesnoth/images/terrain/flag-team1.png
+share/wesnoth/images/terrain/flag-team10.png
 share/wesnoth/images/terrain/flag-team2.png
 share/wesnoth/images/terrain/flag-team3.png
 share/wesnoth/images/terrain/flag-team4.png
 share/wesnoth/images/terrain/flag-team5.png
 share/wesnoth/images/terrain/flag-team6.png
-share/wesnoth/images/terrain/flag.png
+share/wesnoth/images/terrain/flag-team7.png
+share/wesnoth/images/terrain/flag-team8.png
+share/wesnoth/images/terrain/flag-team9.png
+share/wesnoth/images/terrain/fog-n.png
+share/wesnoth/images/terrain/fog-ne.png
+share/wesnoth/images/terrain/fog-nw.png
+share/wesnoth/images/terrain/fog-s.png
+share/wesnoth/images/terrain/fog-se.png
+share/wesnoth/images/terrain/fog-sw.png
+share/wesnoth/images/terrain/fog.png
 share/wesnoth/images/terrain/forest-n.png
 share/wesnoth/images/terrain/forest-ne.png
 share/wesnoth/images/terrain/forest-nw.png
@@ -494,6 +780,7 @@ share/wesnoth/images/terrain/grassland-sw-nw-n.png
 share/wesnoth/images/terrain/grassland-sw-nw.png
 share/wesnoth/images/terrain/grassland-sw.png
 share/wesnoth/images/terrain/grassland.png
+share/wesnoth/images/terrain/grid.png
 share/wesnoth/images/terrain/hills-n-ne.png
 share/wesnoth/images/terrain/hills-n.png
 share/wesnoth/images/terrain/hills-ne.png
@@ -507,6 +794,7 @@ share/wesnoth/images/terrain/human-village.gif
 share/wesnoth/images/terrain/human-village.png
 share/wesnoth/images/terrain/keep.png
 share/wesnoth/images/terrain/lava.png
+share/wesnoth/images/terrain/mask.png
 share/wesnoth/images/terrain/mine.png
 share/wesnoth/images/terrain/mountains-n.png
 share/wesnoth/images/terrain/mountains-ne.png
@@ -524,10 +812,27 @@ share/wesnoth/images/terrain/ocean-s.png
 share/wesnoth/images/terrain/ocean-se.png
 share/wesnoth/images/terrain/ocean-sw.png
 share/wesnoth/images/terrain/ocean.png
+share/wesnoth/images/terrain/out.png
 share/wesnoth/images/terrain/pier.png
 share/wesnoth/images/terrain/road.png
 share/wesnoth/images/terrain/rocks.png
 share/wesnoth/images/terrain/signpost.png
+share/wesnoth/images/terrain/snow-forest-n.png
+share/wesnoth/images/terrain/snow-forest-ne.png
+share/wesnoth/images/terrain/snow-forest-nw.png
+share/wesnoth/images/terrain/snow-forest-s.png
+share/wesnoth/images/terrain/snow-forest-se.png
+share/wesnoth/images/terrain/snow-forest-sw.png
+share/wesnoth/images/terrain/snow-forest.png
+share/wesnoth/images/terrain/snow-hills-n-ne.png
+share/wesnoth/images/terrain/snow-hills-n.png
+share/wesnoth/images/terrain/snow-hills-ne.png
+share/wesnoth/images/terrain/snow-hills-nw.png
+share/wesnoth/images/terrain/snow-hills-s-sw.png
+share/wesnoth/images/terrain/snow-hills-s.png
+share/wesnoth/images/terrain/snow-hills-se.png
+share/wesnoth/images/terrain/snow-hills-sw.png
+share/wesnoth/images/terrain/snow-hills.png
 share/wesnoth/images/terrain/snow-n-ne-se-s.png
 share/wesnoth/images/terrain/snow-n-ne-se.png
 share/wesnoth/images/terrain/snow-n-ne.png
@@ -554,9 +859,17 @@ share/wesnoth/images/terrain/swampwater.png
 share/wesnoth/images/terrain/swampwater2.png
 share/wesnoth/images/terrain/swampwater3.png
 share/wesnoth/images/terrain/temple.png
+share/wesnoth/images/terrain/test.png
+share/wesnoth/images/terrain/void-n.png
+share/wesnoth/images/terrain/void-ne.png
+share/wesnoth/images/terrain/void-nw.png
+share/wesnoth/images/terrain/void-s.png
+share/wesnoth/images/terrain/void-se.png
+share/wesnoth/images/terrain/void-sw.png
 share/wesnoth/images/terrain/void.png
+share/wesnoth/images/thief-attack.png
+share/wesnoth/images/thief-defend.png
 share/wesnoth/images/thief.png
-share/wesnoth/images/title.png
 share/wesnoth/images/troll-grunt-attack.png
 share/wesnoth/images/troll-grunt.png
 share/wesnoth/images/troll-warrior-attack.png
@@ -567,13 +880,20 @@ share/wesnoth/images/troll-whelp.png
 share/wesnoth/images/undead-adept-attack.png
 share/wesnoth/images/undead-adept-defend.png
 share/wesnoth/images/undead-adept.png
+share/wesnoth/images/undead-ancient-lich-attack.png
+share/wesnoth/images/undead-ancient-lich-defend.png
 share/wesnoth/images/undead-ancient-lich.png
 share/wesnoth/images/undead-archer.png
+share/wesnoth/images/undead-bat-attack.png
 share/wesnoth/images/undead-bat.png
+share/wesnoth/images/undead-blackspell.png
 share/wesnoth/images/undead-bloodbat.png
 share/wesnoth/images/undead-boneshooter.png
 share/wesnoth/images/undead-chocobone.png
 share/wesnoth/images/undead-deathknight.png
+share/wesnoth/images/undead-ghost-attack.png
+share/wesnoth/images/undead-ghost-attack1.png
+share/wesnoth/images/undead-ghost-defend.png
 share/wesnoth/images/undead-ghost.png
 share/wesnoth/images/undead-ghoul-attack.png
 share/wesnoth/images/undead-ghoul-defend.png
@@ -583,29 +903,51 @@ share/wesnoth/images/undead-necromancer-attack.png
 share/wesnoth/images/undead-necromancer-attack2.png
 share/wesnoth/images/undead-necromancer-defend.png
 share/wesnoth/images/undead-necromancer.png
+share/wesnoth/images/undead-nightgaunt-attack.png
+share/wesnoth/images/undead-nightgaunt-attack2.png
+share/wesnoth/images/undead-nightgaunt-defend.png
+share/wesnoth/images/undead-nightgaunt.png
+share/wesnoth/images/undead-revenant-attack.png
 share/wesnoth/images/undead-revenant.png
+share/wesnoth/images/undead-shadow-attack.png
+share/wesnoth/images/undead-shadow-defend.png
+share/wesnoth/images/undead-shadow.png
+share/wesnoth/images/undead-skeleton-defend.png
 share/wesnoth/images/undead-skeleton.png
+share/wesnoth/images/undead-spectre-attack.png
+share/wesnoth/images/undead-spectre-attack1.png
+share/wesnoth/images/undead-spectre-defend.png
+share/wesnoth/images/undead-spectre.png
+share/wesnoth/images/undead-wraith-attack1.png
 share/wesnoth/images/undead-wraith.png
 share/wesnoth/images/undead-zombie-attack.png
 share/wesnoth/images/undead-zombie.png
 share/wesnoth/images/unmoved-energy.png
 share/wesnoth/images/water_spay.png
 share/wesnoth/images/web.png
+share/wesnoth/images/wesnoth-icon.png
 share/wesnoth/images/white-cleric.png
 share/wesnoth/images/white-mage.png
 share/wesnoth/images/whitemissile-n.png
 share/wesnoth/images/whitemissile-ne.png
 share/wesnoth/images/wolf-rider-attack.png
+share/wesnoth/images/wolf-rider-defend.png
 share/wesnoth/images/wolf-rider.png
+share/wesnoth/music/elf-land.ogg
+share/wesnoth/music/frantic.ogg
+share/wesnoth/music/underground.ogg
 share/wesnoth/music/wesnoth-1.ogg
 share/wesnoth/music/wesnoth-2.ogg
 share/wesnoth/music/wesnoth-3.ogg
 share/wesnoth/music/wesnoth-4.ogg
 share/wesnoth/music/wesnoth-5.ogg
 share/wesnoth/music/wesnoth-6.ogg
+share/wesnoth/music/wesnoth-7.ogg
+share/wesnoth/music/wesnoth-8.ogg
 share/wesnoth/sounds/arrow-hit.wav
 share/wesnoth/sounds/arrow-miss.wav
 share/wesnoth/sounds/bell.wav
+share/wesnoth/sounds/dart.wav
 share/wesnoth/sounds/fire.wav
 share/wesnoth/sounds/firearrow.wav
 share/wesnoth/sounds/fist-swish.wav
@@ -613,11 +955,20 @@ share/wesnoth/sounds/groan.wav
 share/wesnoth/sounds/gunshot.wav
 share/wesnoth/sounds/heal.wav
 share/wesnoth/sounds/horse-canter.wav
+share/wesnoth/sounds/knife.wav
 share/wesnoth/sounds/lightning.wav
+share/wesnoth/sounds/mace.wav
 share/wesnoth/sounds/magicmissile.wav
+share/wesnoth/sounds/mermen-hit.wav
+share/wesnoth/sounds/net.wav
 share/wesnoth/sounds/pistol.wav
+share/wesnoth/sounds/skeleton-hit.wav
+share/wesnoth/sounds/spear.wav
+share/wesnoth/sounds/staff.wav
 share/wesnoth/sounds/sword-clang.wav
 share/wesnoth/sounds/sword-swish.wav
+share/wesnoth/sounds/ugg.wav
+share/wesnoth/sounds/wolf-cry.wav
 @dirrm share/wesnoth/sounds
 @dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/terrain
@@ -627,6 +978,7 @@ share/wesnoth/sounds/sword-swish.wav
 @dirrm share/wesnoth/fonts
 @dirrm share/wesnoth/data/units
 @dirrm share/wesnoth/data/translations
+@dirrm share/wesnoth/data/themes
 @dirrm share/wesnoth/data/scenarios
 @dirrm share/wesnoth/data/maps
 @dirrm share/wesnoth/data
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 1a605b561e79..ea1607aca36c 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.wesnoth.org/files/
 
@@ -19,7 +18,7 @@ USE_GNOME=	gnometarget
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
-MAN6=		wesnoth.6 wesnothd.6
+MAN6=		wesnoth.6 wesnoth_editor.6 wesnothd.6
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 8b9c9c56e022..7f8d69def59a 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,2 +1,2 @@
-MD5 (wesnoth-0.6.1.tar.gz) = 716f3507d044318b63c907134356708c
-SIZE (wesnoth-0.6.1.tar.gz) = 11616064
+MD5 (wesnoth-0.7.tar.gz) = 8c38f71db9c689148c300474992eb260
+SIZE (wesnoth-0.7.tar.gz) = 17497561
diff --git a/games/wesnoth/files/patch-src::widgets::menu.cpp b/games/wesnoth/files/patch-src::widgets::menu.cpp
deleted file mode 100644
index 7e8eddbfad3e..000000000000
--- a/games/wesnoth/files/patch-src::widgets::menu.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/widgets/menu.cpp.orig	Thu Jan 29 22:23:06 2004
-+++ src/widgets/menu.cpp	Thu Jan 29 22:23:49 2004
-@@ -191,8 +191,8 @@
- 			x = event.button.x;
- 			y = event.button.y;
- 		} else {
--			x = reinterpret_cast<int>(event.user.data1);
--			y = reinterpret_cast<int>(event.user.data2);
-+			x = (int)event.user.data1;
-+			y = (int)event.user.data2;
- 		}
- 
- 		const int item = hit(x,y);
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index beb15ec7535d..d768e1fd835e 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -19,6 +19,7 @@ share/wesnoth/data/maps/kingatsea
 share/wesnoth/data/maps/map-test
 share/wesnoth/data/maps/map-threerivers
 share/wesnoth/data/maps/map-tutorial
+share/wesnoth/data/maps/map-tutorial2
 share/wesnoth/data/maps/map0
 share/wesnoth/data/maps/map0-bak
 share/wesnoth/data/maps/map0b
@@ -36,30 +37,41 @@ share/wesnoth/data/maps/map6
 share/wesnoth/data/maps/map7
 share/wesnoth/data/maps/map8
 share/wesnoth/data/maps/map9
+share/wesnoth/data/maps/north-elves
 share/wesnoth/data/maps/north-winter
 share/wesnoth/data/maps/sceptre
 share/wesnoth/data/maps/snowplains
 share/wesnoth/data/maps/swampland
+share/wesnoth/data/maps/undeadbook
+share/wesnoth/data/maps/undeadtower
 share/wesnoth/data/maps/undmap1
 share/wesnoth/data/maps/undmap2
+share/wesnoth/data/maps/undmap3
+share/wesnoth/data/maps/undmapbrother
+share/wesnoth/data/maps/undmapmages
+share/wesnoth/data/maps/undmapskull
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
-share/wesnoth/data/ranmap.cfg
 share/wesnoth/data/sample_translation.cfg
 share/wesnoth/data/scenario-test.cfg
 share/wesnoth/data/scenarios/A_Choice_Must_Be_Made.cfg
 share/wesnoth/data/scenarios/Bay_of_Pearls.cfg
 share/wesnoth/data/scenarios/Blackwater_Port.cfg
 share/wesnoth/data/scenarios/Brother_Against_Brother.cfg
+share/wesnoth/data/scenarios/Crelanus_Book.cfg
 share/wesnoth/data/scenarios/Crossroads.cfg
 share/wesnoth/data/scenarios/Dwarven_Doors.cfg
+share/wesnoth/data/scenarios/Elven_Council.cfg
 share/wesnoth/data/scenarios/Elves_Besieged.cfg
 share/wesnoth/data/scenarios/Ford_of_Abez.cfg
 share/wesnoth/data/scenarios/Gryphon_Mountain.cfg
 share/wesnoth/data/scenarios/Hasty_Alliance.cfg
 share/wesnoth/data/scenarios/High_King_at_Sea.cfg
+share/wesnoth/data/scenarios/Home_North_Elves.cfg
+share/wesnoth/data/scenarios/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/Isle_of_Anduin.cfg
 share/wesnoth/data/scenarios/Isle_of_the_Damned.cfg
+share/wesnoth/data/scenarios/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/Mountain_Pass.cfg
 share/wesnoth/data/scenarios/Muff_Malal_Peninsula.cfg
 share/wesnoth/data/scenarios/Northern_Winter.cfg
@@ -67,30 +79,40 @@ share/wesnoth/data/scenarios/Plunging_Into_the_Darkness.cfg
 share/wesnoth/data/scenarios/Princess_of_Wesnoth.cfg
 share/wesnoth/data/scenarios/Random_Scenario.cfg
 share/wesnoth/data/scenarios/Sceptre.cfg
-share/wesnoth/data/scenarios/Siege_to_Elefansar.cfg
 share/wesnoth/data/scenarios/Snow_Plains.cfg
 share/wesnoth/data/scenarios/Swamp_Of_Dread.cfg
-share/wesnoth/data/scenarios/The_Liberation_Front.cfg
 share/wesnoth/data/scenarios/The_Lost_General.cfg
+share/wesnoth/data/scenarios/The_Siege_of_Elensefar.cfg
 share/wesnoth/data/scenarios/The_Skull_of_Agarash.cfg
 share/wesnoth/data/scenarios/Valley_of_Death.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain.cfg
+share/wesnoth/data/terrain_generator.cfg
+share/wesnoth/data/themes/default.cfg
+share/wesnoth/data/translations/brazilian.cfg
 share/wesnoth/data/translations/danish.cfg
 share/wesnoth/data/translations/dutch.cfg
 share/wesnoth/data/translations/english.cfg
+share/wesnoth/data/translations/finnish.cfg
 share/wesnoth/data/translations/french.cfg
 share/wesnoth/data/translations/german.cfg
 share/wesnoth/data/translations/hungarian.cfg
 share/wesnoth/data/translations/italian.cfg
+share/wesnoth/data/translations/norwegian.cfg
 share/wesnoth/data/translations/polish.cfg
+share/wesnoth/data/translations/portuguesebr.cfg
+share/wesnoth/data/translations/slovak.cfg
 share/wesnoth/data/translations/spanish.cfg
+share/wesnoth/data/translations/swedish.cfg
 share/wesnoth/data/tutorial.cfg
+share/wesnoth/data/tutorial2.cfg
 share/wesnoth/data/units/Ancient_Lich.cfg
 share/wesnoth/data/units/Arch_Mage.cfg
 share/wesnoth/data/units/Assassin.cfg
+share/wesnoth/data/units/Bandit.cfg
 share/wesnoth/data/units/Blood_Bat.cfg
 share/wesnoth/data/units/Bone_Shooter.cfg
+share/wesnoth/data/units/Bowman.cfg
 share/wesnoth/data/units/Cavalry.cfg
 share/wesnoth/data/units/Cave_Spider.cfg
 share/wesnoth/data/units/Chocobone.cfg
@@ -98,7 +120,10 @@ share/wesnoth/data/units/Commander.cfg
 share/wesnoth/data/units/Cuttle_Fish.cfg
 share/wesnoth/data/units/Dark_Adept.cfg
 share/wesnoth/data/units/Dark_Apprentice.cfg
+share/wesnoth/data/units/Dark_Spirit.cfg
 share/wesnoth/data/units/Death_Knight.cfg
+share/wesnoth/data/units/Deathmaster.cfg
+share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Dragoon.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
@@ -127,6 +152,7 @@ share/wesnoth/data/units/Elvish_Shyde.cfg
 share/wesnoth/data/units/Evil_Necromancer.cfg
 share/wesnoth/data/units/Fencer.cfg
 share/wesnoth/data/units/Fighter.cfg
+share/wesnoth/data/units/Footpad.cfg
 share/wesnoth/data/units/Galleon.cfg
 share/wesnoth/data/units/General.cfg
 share/wesnoth/data/units/Ghost.cfg
@@ -138,27 +164,35 @@ share/wesnoth/data/units/Gryphon.cfg
 share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
+share/wesnoth/data/units/Heavy_Infantryman.cfg
 share/wesnoth/data/units/Horseman.cfg
+share/wesnoth/data/units/Initiate.cfg
 share/wesnoth/data/units/Knight.cfg
 share/wesnoth/data/units/Lich.cfg
 share/wesnoth/data/units/Lieutenant.cfg
+share/wesnoth/data/units/Longbowman.cfg
 share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
 share/wesnoth/data/units/Mage_of_Light.cfg
+share/wesnoth/data/units/Master_Bowman.cfg
 share/wesnoth/data/units/Merman.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
+share/wesnoth/data/units/Nightgaunt.cfg
 share/wesnoth/data/units/Ogre.cfg
 share/wesnoth/data/units/Orcish_Archer.cfg
 share/wesnoth/data/units/Orcish_Assassin.cfg
 share/wesnoth/data/units/Orcish_Crossbow.cfg
+share/wesnoth/data/units/Orcish_Crossbowman.cfg
 share/wesnoth/data/units/Orcish_Grunt.cfg
 share/wesnoth/data/units/Orcish_Slayer.cfg
 share/wesnoth/data/units/Orcish_Warlord.cfg
 share/wesnoth/data/units/Orcish_Warrior.cfg
+share/wesnoth/data/units/Outlaw.cfg
 share/wesnoth/data/units/Paladin.cfg
 share/wesnoth/data/units/Pikeman.cfg
+share/wesnoth/data/units/Poacher.cfg
 share/wesnoth/data/units/Princess.cfg
 share/wesnoth/data/units/Red_Mage.cfg
 share/wesnoth/data/units/Revenant.cfg
@@ -167,13 +201,18 @@ share/wesnoth/data/units/Royal_Guard.cfg
 share/wesnoth/data/units/Sea_Hag.cfg
 share/wesnoth/data/units/Sea_Orc.cfg
 share/wesnoth/data/units/Sea_Serpent.cfg
+share/wesnoth/data/units/Shadow.cfg
 share/wesnoth/data/units/Shock_Trooper.cfg
 share/wesnoth/data/units/Skeleton.cfg
 share/wesnoth/data/units/Skeleton_Archer.cfg
 share/wesnoth/data/units/Sleeping_Gryphon.cfg
 share/wesnoth/data/units/Spearman.cfg
+share/wesnoth/data/units/Spectre.cfg
 share/wesnoth/data/units/Swordsman.cfg
 share/wesnoth/data/units/Thief.cfg
+share/wesnoth/data/units/Thug.cfg
+share/wesnoth/data/units/Trapper.cfg
+share/wesnoth/data/units/Triton.cfg
 share/wesnoth/data/units/Troll.cfg
 share/wesnoth/data/units/Troll_Warrior.cfg
 share/wesnoth/data/units/Troll_Whelp.cfg
@@ -182,6 +221,7 @@ share/wesnoth/data/units/Walking_Corpse.cfg
 share/wesnoth/data/units/White_Mage.cfg
 share/wesnoth/data/units/Wolf_Rider.cfg
 share/wesnoth/data/units/Wraith.cfg
+share/wesnoth/data/units/Youth.cfg
 share/wesnoth/data/utils.cfg
 share/wesnoth/fonts/Vera.ttf
 share/wesnoth/images/Afternoon.png
@@ -193,6 +233,8 @@ share/wesnoth/images/Morning.png
 share/wesnoth/images/Night.png
 share/wesnoth/images/SecondWatch.png
 share/wesnoth/images/ally-energy.png
+share/wesnoth/images/arch-mage-attack2.png
+share/wesnoth/images/arch-mage-defend.png
 share/wesnoth/images/arch-mage.png
 share/wesnoth/images/assassin.png
 share/wesnoth/images/bone-n.png
@@ -201,22 +243,44 @@ share/wesnoth/images/bullet.png
 share/wesnoth/images/buttons/button-active.png
 share/wesnoth/images/buttons/button-pressed.png
 share/wesnoth/images/buttons/button.png
+share/wesnoth/images/buttons/checkbox-active-pressed.png
+share/wesnoth/images/buttons/checkbox-active.png
+share/wesnoth/images/buttons/checkbox-pressed.png
+share/wesnoth/images/buttons/checkbox.png
 share/wesnoth/images/buttons/downarrow-button-active.png
 share/wesnoth/images/buttons/downarrow-button-pressed.png
 share/wesnoth/images/buttons/downarrow-button.png
+share/wesnoth/images/buttons/lite-active.png
+share/wesnoth/images/buttons/lite-pressed.png
+share/wesnoth/images/buttons/lite.png
+share/wesnoth/images/buttons/scrollbottom-active.png
+share/wesnoth/images/buttons/scrollbottom.png
+share/wesnoth/images/buttons/scrollgroove-bottom.png
+share/wesnoth/images/buttons/scrollgroove-mid.png
+share/wesnoth/images/buttons/scrollgroove-top.png
+share/wesnoth/images/buttons/scrollmid-active.png
+share/wesnoth/images/buttons/scrollmid.png
+share/wesnoth/images/buttons/scrolltop-active.png
+share/wesnoth/images/buttons/scrolltop.png
 share/wesnoth/images/buttons/slider-selected.png
 share/wesnoth/images/buttons/slider.png
 share/wesnoth/images/buttons/uparrow-button-active.png
 share/wesnoth/images/buttons/uparrow-button-pressed.png
 share/wesnoth/images/buttons/uparrow-button.png
 share/wesnoth/images/cavespider.png
-share/wesnoth/images/cross.png
+share/wesnoth/images/cockatrice-attack1.png
+share/wesnoth/images/cockatrice-attack2.png
+share/wesnoth/images/cockatrice.png
 share/wesnoth/images/cuttlefish.png
 share/wesnoth/images/darkmissile-n.png
 share/wesnoth/images/darkmissile-ne.png
 share/wesnoth/images/dwarf-berserker.png
+share/wesnoth/images/dwarf-fighter-attack.png
 share/wesnoth/images/dwarf-fighter-defend.png
 share/wesnoth/images/dwarf-fighter.png
+share/wesnoth/images/dwarf-lord-attack.png
+share/wesnoth/images/dwarf-lord-defend.png
+share/wesnoth/images/dwarf-lord.png
 share/wesnoth/images/dwarf-runemaster-attack.png
 share/wesnoth/images/dwarf-runemaster-defend.png
 share/wesnoth/images/dwarf-runemaster.png
@@ -224,6 +288,8 @@ share/wesnoth/images/dwarf-thunderer-attack.png
 share/wesnoth/images/dwarf-thunderer-attack1.png
 share/wesnoth/images/dwarf-thunderer-defend.png
 share/wesnoth/images/dwarf-thunderer.png
+share/wesnoth/images/dwarf-warrior-attack.png
+share/wesnoth/images/dwarf-warrior-defend.png
 share/wesnoth/images/dwarf-warrior.png
 share/wesnoth/images/elder-mage-attack.png
 share/wesnoth/images/elder-mage-defend.png
@@ -231,17 +297,27 @@ share/wesnoth/images/elder-mage.png
 share/wesnoth/images/elvish-archer-attack.png
 share/wesnoth/images/elvish-archer-attack1.png
 share/wesnoth/images/elvish-archer-attack2.png
+share/wesnoth/images/elvish-archer-bow-defend.png
+share/wesnoth/images/elvish-archer-defend.png
 share/wesnoth/images/elvish-archer.png
+share/wesnoth/images/elvish-avenger-attack.png
+share/wesnoth/images/elvish-avenger-attack1.png
+share/wesnoth/images/elvish-avenger-attack2.png
+share/wesnoth/images/elvish-avenger-bow-defend.png
+share/wesnoth/images/elvish-avenger-bow.png
+share/wesnoth/images/elvish-avenger-defend.png
 share/wesnoth/images/elvish-avenger.png
 share/wesnoth/images/elvish-captain-attack.png
 share/wesnoth/images/elvish-captain-bow-attack1.png
 share/wesnoth/images/elvish-captain-bow-attack2.png
+share/wesnoth/images/elvish-captain-bow-defend.png
 share/wesnoth/images/elvish-captain-bow.png
 share/wesnoth/images/elvish-captain-defend.png
 share/wesnoth/images/elvish-captain.png
 share/wesnoth/images/elvish-champion-attack.png
 share/wesnoth/images/elvish-champion-defend.png
 share/wesnoth/images/elvish-champion.png
+share/wesnoth/images/elvish-druid-defend.png
 share/wesnoth/images/elvish-druid.png
 share/wesnoth/images/elvish-fighter-attack.png
 share/wesnoth/images/elvish-fighter-bow-attack1.png
@@ -253,19 +329,34 @@ share/wesnoth/images/elvish-fighter.png
 share/wesnoth/images/elvish-hero-attack.png
 share/wesnoth/images/elvish-hero.png
 share/wesnoth/images/elvish-lord.png
+share/wesnoth/images/elvish-marksman-attack.png
+share/wesnoth/images/elvish-marksman-attack1.png
+share/wesnoth/images/elvish-marksman-attack2.png
+share/wesnoth/images/elvish-marksman-bow-defend.png
 share/wesnoth/images/elvish-marksman.png
+share/wesnoth/images/elvish-marshal-attack.png
+share/wesnoth/images/elvish-marshal-bow.png
+share/wesnoth/images/elvish-marshal-defend.png
 share/wesnoth/images/elvish-marshal.png
+share/wesnoth/images/elvish-outrider-attack.png
+share/wesnoth/images/elvish-outrider-defend.png
 share/wesnoth/images/elvish-outrider.png
 share/wesnoth/images/elvish-ranger-attack.png
 share/wesnoth/images/elvish-ranger-attack1.png
 share/wesnoth/images/elvish-ranger-attack2.png
+share/wesnoth/images/elvish-ranger-bow-defend.png
+share/wesnoth/images/elvish-ranger-defend.png
 share/wesnoth/images/elvish-ranger.png
 share/wesnoth/images/elvish-scout-attack.png
+share/wesnoth/images/elvish-scout-defend.png
 share/wesnoth/images/elvish-scout.png
 share/wesnoth/images/elvish-shaman-attack.png
 share/wesnoth/images/elvish-shaman-attack2.png
 share/wesnoth/images/elvish-shaman-defend.png
 share/wesnoth/images/elvish-shaman.png
+share/wesnoth/images/elvish-sharpshooter-attack.png
+share/wesnoth/images/elvish-sharpshooter-attack1.png
+share/wesnoth/images/elvish-sharpshooter-attack2.png
 share/wesnoth/images/elvish-sharpshooter.png
 share/wesnoth/images/elvish-shyde.png
 share/wesnoth/images/enemy-energy.png
@@ -284,35 +375,93 @@ share/wesnoth/images/gryphon-sleeping.png
 share/wesnoth/images/gryphon.png
 share/wesnoth/images/horseman-attack.png
 share/wesnoth/images/horseman.png
+share/wesnoth/images/human-battleprincess.png
+share/wesnoth/images/human-bowman-attack-sword.png
+share/wesnoth/images/human-bowman-attack1.png
+share/wesnoth/images/human-bowman-attack2.png
+share/wesnoth/images/human-bowman-defend.png
+share/wesnoth/images/human-bowman.png
 share/wesnoth/images/human-dragoon.png
 share/wesnoth/images/human-duelist-defend.png
 share/wesnoth/images/human-duelist.png
 share/wesnoth/images/human-fencer-defend.png
 share/wesnoth/images/human-fencer.png
+share/wesnoth/images/human-general-defend.png
 share/wesnoth/images/human-general.png
 share/wesnoth/images/human-halbardier.png
+share/wesnoth/images/human-heavyinfantry-attack.png
+share/wesnoth/images/human-heavyinfantry-defend.png
 share/wesnoth/images/human-heavyinfantry.png
 share/wesnoth/images/human-lieutenant.png
+share/wesnoth/images/human-longbowman-attack-sword.png
+share/wesnoth/images/human-longbowman-attack1.png
+share/wesnoth/images/human-longbowman-attack2.png
+share/wesnoth/images/human-longbowman-defend-close.png
+share/wesnoth/images/human-longbowman-defend.png
+share/wesnoth/images/human-longbowman.png
+share/wesnoth/images/human-masterbowman.png
 share/wesnoth/images/human-pikeman.png
+share/wesnoth/images/human-princess-attack.png
+share/wesnoth/images/human-princess-defend.png
 share/wesnoth/images/human-princess.png
 share/wesnoth/images/human-queen.png
+share/wesnoth/images/human-royalguard-defend.png
 share/wesnoth/images/human-royalguard.png
+share/wesnoth/images/human-scout-attack.png
 share/wesnoth/images/human-scout.png
+share/wesnoth/images/human-shocktrooper-attack.png
 share/wesnoth/images/human-shocktrooper.png
 share/wesnoth/images/human-spearman-attack.png
 share/wesnoth/images/human-spearman-attack2.png
 share/wesnoth/images/human-spearman-defend.png
 share/wesnoth/images/human-spearman.png
+share/wesnoth/images/human-swordman-attack.png
+share/wesnoth/images/human-swordman-defend.png
 share/wesnoth/images/human-swordman.png
-share/wesnoth/images/icon.png
 share/wesnoth/images/ink.png
-share/wesnoth/images/item-flamesword.png
-share/wesnoth/images/item-holywater.png
-share/wesnoth/images/item-sceptreoffire.png
+share/wesnoth/images/item-ball1.png
+share/wesnoth/images/item-ball2.png
+share/wesnoth/images/item-barrel.png
+share/wesnoth/images/item-book1.png
+share/wesnoth/images/item-book2.png
+share/wesnoth/images/item-book3.png
+share/wesnoth/images/item-book4.png
+share/wesnoth/images/item-box.png
+share/wesnoth/images/item-dragonstatue.png
+share/wesnoth/images/item-flower1.png
+share/wesnoth/images/item-flower2.png
+share/wesnoth/images/item-flower3.png
+share/wesnoth/images/item-flower4.png
+share/wesnoth/images/item-leanto.png
+share/wesnoth/images/item-monolith.png
+share/wesnoth/images/item-monolith1.png
+share/wesnoth/images/item-monolith2.png
+share/wesnoth/images/item-monolith3.png
+share/wesnoth/images/item-monolith4.png
+share/wesnoth/images/item-ornate1.png
+share/wesnoth/images/item-ornate2.png
+share/wesnoth/images/item-pine1.png
+share/wesnoth/images/item-pine2.png
+share/wesnoth/images/item-potion1.png
+share/wesnoth/images/item-potion2.png
+share/wesnoth/images/item-potion3.png
+share/wesnoth/images/item-potion4.png
+share/wesnoth/images/item-ring1.png
+share/wesnoth/images/item-ring2.png
+share/wesnoth/images/item-rock1.png
+share/wesnoth/images/item-rock2.png
+share/wesnoth/images/item-rock3.png
+share/wesnoth/images/item-rock4.png
+share/wesnoth/images/item-slab.png
+share/wesnoth/images/item-well.png
 share/wesnoth/images/knight.png
 share/wesnoth/images/konrad-commander-attack1.png
 share/wesnoth/images/konrad-commander-attack2.png
 share/wesnoth/images/konrad-commander.png
+share/wesnoth/images/konrad-fighter-attack.png
+share/wesnoth/images/konrad-fighter-defend.png
+share/wesnoth/images/konrad-fighter.png
+share/wesnoth/images/konrad-lord-attack.png
 share/wesnoth/images/konrad-lord.png
 share/wesnoth/images/konrad-young-attack.png
 share/wesnoth/images/konrad-young.png
@@ -325,28 +474,76 @@ share/wesnoth/images/mage-attack3.png
 share/wesnoth/images/mage.png
 share/wesnoth/images/magicmissile-n.png
 share/wesnoth/images/magicmissile-ne.png
+share/wesnoth/images/merman-defend.png
+share/wesnoth/images/merman-king-attack.png
+share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
 share/wesnoth/images/merman.png
+share/wesnoth/images/misc/axe.png
+share/wesnoth/images/misc/baneblade.png
+share/wesnoth/images/misc/battleaxe.png
+share/wesnoth/images/misc/blank.png
 share/wesnoth/images/misc/botleft-corner.png
 share/wesnoth/images/misc/botright-corner.png
+share/wesnoth/images/misc/bow.png
 share/wesnoth/images/misc/cage.png
 share/wesnoth/images/misc/character-box.png
 share/wesnoth/images/misc/chest.png
+share/wesnoth/images/misc/claws.png
+share/wesnoth/images/misc/club.png
 share/wesnoth/images/misc/compass-north.png
 share/wesnoth/images/misc/compass-south.png
 share/wesnoth/images/misc/cross.png
+share/wesnoth/images/misc/dagger.png
+share/wesnoth/images/misc/dark-missile.png
+share/wesnoth/images/misc/darkstaff.png
+share/wesnoth/images/misc/darts.png
 share/wesnoth/images/misc/delfador.png
+share/wesnoth/images/misc/disk.png
 share/wesnoth/images/misc/dot.png
+share/wesnoth/images/misc/druidstaff.png
+share/wesnoth/images/misc/entangle.png
+share/wesnoth/images/misc/fangs.png
+share/wesnoth/images/misc/fireball.png
+share/wesnoth/images/misc/fist.png
 share/wesnoth/images/misc/font8x8.png
 share/wesnoth/images/misc/foot-left-n.png
 share/wesnoth/images/misc/foot-left-nw.png
 share/wesnoth/images/misc/foot-right-n.png
 share/wesnoth/images/misc/foot-right-nw.png
+share/wesnoth/images/misc/frenzy.png
+share/wesnoth/images/misc/gold.png
+share/wesnoth/images/misc/halberd.png
+share/wesnoth/images/misc/hammer.png
+share/wesnoth/images/misc/hatchet.png
+share/wesnoth/images/misc/income.png
+share/wesnoth/images/misc/invisible.png
+share/wesnoth/images/misc/item-darktome.png
+share/wesnoth/images/misc/item-flamesword.png
+share/wesnoth/images/misc/item-healingpotion.png
+share/wesnoth/images/misc/item-holywater.png
+share/wesnoth/images/misc/item-sceptreoffire.png
+share/wesnoth/images/misc/item-staff.png
 share/wesnoth/images/misc/item-stormtrident.png
 share/wesnoth/images/misc/kalenz.png
+share/wesnoth/images/misc/knife.png
 share/wesnoth/images/misc/konrad.png
+share/wesnoth/images/misc/lance.png
+share/wesnoth/images/misc/lightingbolt.png
 share/wesnoth/images/misc/lisar.png
 share/wesnoth/images/misc/lobby.png
+share/wesnoth/images/misc/logo.png
+share/wesnoth/images/misc/longbow.png
+share/wesnoth/images/misc/mace.png
+share/wesnoth/images/misc/mainmenu-background.png
+share/wesnoth/images/misc/mainmenu-border-botleft.png
+share/wesnoth/images/misc/mainmenu-border-botright.png
+share/wesnoth/images/misc/mainmenu-border-bottom.png
+share/wesnoth/images/misc/mainmenu-border-left.png
+share/wesnoth/images/misc/mainmenu-border-right.png
+share/wesnoth/images/misc/mainmenu-border-top.png
+share/wesnoth/images/misc/mainmenu-border-topleft.png
+share/wesnoth/images/misc/mainmenu-border-topright.png
 share/wesnoth/images/misc/map.png
 share/wesnoth/images/misc/menu-background.png
 share/wesnoth/images/misc/menu-border-botleft.png
@@ -357,9 +554,32 @@ share/wesnoth/images/misc/menu-border-right.png
 share/wesnoth/images/misc/menu-border-top.png
 share/wesnoth/images/misc/menu-border-topleft.png
 share/wesnoth/images/misc/menu-border-topright.png
+share/wesnoth/images/misc/menu2-background.png
+share/wesnoth/images/misc/menu2-border-botleft.png
+share/wesnoth/images/misc/menu2-border-botright.png
+share/wesnoth/images/misc/menu2-border-bottom.png
+share/wesnoth/images/misc/menu2-border-left.png
+share/wesnoth/images/misc/menu2-border-right.png
+share/wesnoth/images/misc/menu2-border-top.png
+share/wesnoth/images/misc/menu2-border-topleft.png
+share/wesnoth/images/misc/menu2-border-topright.png
+share/wesnoth/images/misc/missile.png
+share/wesnoth/images/misc/paladinsword.png
+share/wesnoth/images/misc/pike.png
+share/wesnoth/images/misc/poisoned.png
+share/wesnoth/images/misc/rapier.png
+share/wesnoth/images/misc/rightside-bg.png
 share/wesnoth/images/misc/rightside-bottom.png
 share/wesnoth/images/misc/rightside-editor.png
 share/wesnoth/images/misc/rightside.png
+share/wesnoth/images/misc/short-sword.png
+share/wesnoth/images/misc/sling.png
+share/wesnoth/images/misc/slowed.png
+share/wesnoth/images/misc/spear.png
+share/wesnoth/images/misc/staff.png
+share/wesnoth/images/misc/status-bg.png
+share/wesnoth/images/misc/story0a.png
+share/wesnoth/images/misc/story0b.png
 share/wesnoth/images/misc/story1.png
 share/wesnoth/images/misc/story2.png
 share/wesnoth/images/misc/story3.png
@@ -368,8 +588,30 @@ share/wesnoth/images/misc/story5.png
 share/wesnoth/images/misc/story6.png
 share/wesnoth/images/misc/story7.png
 share/wesnoth/images/misc/story8.png
+share/wesnoth/images/misc/story9.png
+share/wesnoth/images/misc/sword.png
+share/wesnoth/images/misc/tentacle.png
+share/wesnoth/images/misc/thorns.png
+share/wesnoth/images/misc/title.png
+share/wesnoth/images/misc/top-bg.png
 share/wesnoth/images/misc/topleft-corner.png
 share/wesnoth/images/misc/topright-corner.png
+share/wesnoth/images/misc/torch.png
+share/wesnoth/images/misc/trident.png
+share/wesnoth/images/misc/tutorial1.png
+share/wesnoth/images/misc/tutorial2.png
+share/wesnoth/images/misc/tutorial3.png
+share/wesnoth/images/misc/tutorial3b.png
+share/wesnoth/images/misc/tutorial4.png
+share/wesnoth/images/misc/tutorial5.png
+share/wesnoth/images/misc/tutorial6.png
+share/wesnoth/images/misc/tutorial7.png
+share/wesnoth/images/misc/units.png
+share/wesnoth/images/misc/upkeep.png
+share/wesnoth/images/misc/villages.png
+share/wesnoth/images/misc/waterspray.png
+share/wesnoth/images/misc/web.png
+share/wesnoth/images/misc/woodensword.png
 share/wesnoth/images/missile-n.png
 share/wesnoth/images/missile-ne.png
 share/wesnoth/images/missile-nw.png
@@ -381,14 +623,44 @@ share/wesnoth/images/missiledagger-n.png
 share/wesnoth/images/missiledagger-ne.png
 share/wesnoth/images/missilespear-n.png
 share/wesnoth/images/missilespear-ne.png
+share/wesnoth/images/missilestone.png
 share/wesnoth/images/moved-energy.png
+share/wesnoth/images/naga-defend.png
 share/wesnoth/images/naga.png
+share/wesnoth/images/neutral-bandit-attack.png
+share/wesnoth/images/neutral-bandit-defend.png
+share/wesnoth/images/neutral-bandit.png
+share/wesnoth/images/neutral-footpad-attack.png
+share/wesnoth/images/neutral-footpad-attack1.png
+share/wesnoth/images/neutral-footpad-attack2.png
+share/wesnoth/images/neutral-footpad-defend.png
+share/wesnoth/images/neutral-footpad.png
+share/wesnoth/images/neutral-outlaw-attack.png
+share/wesnoth/images/neutral-outlaw-attack1.png
+share/wesnoth/images/neutral-outlaw-attack2.png
+share/wesnoth/images/neutral-outlaw-defend.png
+share/wesnoth/images/neutral-outlaw.png
+share/wesnoth/images/neutral-poacher-attack.png
+share/wesnoth/images/neutral-poacher-attack1.png
+share/wesnoth/images/neutral-poacher-attack2.png
+share/wesnoth/images/neutral-poacher-defend.png
+share/wesnoth/images/neutral-poacher.png
+share/wesnoth/images/neutral-thug-attack.png
+share/wesnoth/images/neutral-thug-defend.png
+share/wesnoth/images/neutral-thug.png
+share/wesnoth/images/neutral-trapper-attack.png
+share/wesnoth/images/neutral-trapper-attack1.png
+share/wesnoth/images/neutral-trapper-attack2.png
+share/wesnoth/images/neutral-trapper-defend.png
+share/wesnoth/images/neutral-trapper.png
 share/wesnoth/images/ogre.png
 share/wesnoth/images/orc-archer-attack.png
 share/wesnoth/images/orc-archer-attack2.png
 share/wesnoth/images/orc-archer.png
+share/wesnoth/images/orc-assassin-attack.png
 share/wesnoth/images/orc-assassin.png
 share/wesnoth/images/orc-slayer.png
+share/wesnoth/images/orc-xbowman-attack.png
 share/wesnoth/images/orc-xbowman.png
 share/wesnoth/images/orcish-grunt-attack.png
 share/wesnoth/images/orcish-grunt-defend.png
@@ -399,10 +671,14 @@ share/wesnoth/images/orcish-warrior.png
 share/wesnoth/images/paladin.png
 share/wesnoth/images/partmoved-energy.png
 share/wesnoth/images/red-mage.png
+share/wesnoth/images/rogue-attack.png
+share/wesnoth/images/rogue-defend.png
 share/wesnoth/images/rogue.png
+share/wesnoth/images/sea-hag-defend.png
 share/wesnoth/images/sea-hag.png
 share/wesnoth/images/sea-orc.png
 share/wesnoth/images/seaserpent.png
+share/wesnoth/images/terrain/alpha.png
 share/wesnoth/images/terrain/bridge-n-s.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-se-nw.png
@@ -459,12 +735,22 @@ share/wesnoth/images/terrain/flag-neutral-sw.png
 share/wesnoth/images/terrain/flag-neutral.png
 share/wesnoth/images/terrain/flag-snow-neutral.png
 share/wesnoth/images/terrain/flag-team1.png
+share/wesnoth/images/terrain/flag-team10.png
 share/wesnoth/images/terrain/flag-team2.png
 share/wesnoth/images/terrain/flag-team3.png
 share/wesnoth/images/terrain/flag-team4.png
 share/wesnoth/images/terrain/flag-team5.png
 share/wesnoth/images/terrain/flag-team6.png
-share/wesnoth/images/terrain/flag.png
+share/wesnoth/images/terrain/flag-team7.png
+share/wesnoth/images/terrain/flag-team8.png
+share/wesnoth/images/terrain/flag-team9.png
+share/wesnoth/images/terrain/fog-n.png
+share/wesnoth/images/terrain/fog-ne.png
+share/wesnoth/images/terrain/fog-nw.png
+share/wesnoth/images/terrain/fog-s.png
+share/wesnoth/images/terrain/fog-se.png
+share/wesnoth/images/terrain/fog-sw.png
+share/wesnoth/images/terrain/fog.png
 share/wesnoth/images/terrain/forest-n.png
 share/wesnoth/images/terrain/forest-ne.png
 share/wesnoth/images/terrain/forest-nw.png
@@ -494,6 +780,7 @@ share/wesnoth/images/terrain/grassland-sw-nw-n.png
 share/wesnoth/images/terrain/grassland-sw-nw.png
 share/wesnoth/images/terrain/grassland-sw.png
 share/wesnoth/images/terrain/grassland.png
+share/wesnoth/images/terrain/grid.png
 share/wesnoth/images/terrain/hills-n-ne.png
 share/wesnoth/images/terrain/hills-n.png
 share/wesnoth/images/terrain/hills-ne.png
@@ -507,6 +794,7 @@ share/wesnoth/images/terrain/human-village.gif
 share/wesnoth/images/terrain/human-village.png
 share/wesnoth/images/terrain/keep.png
 share/wesnoth/images/terrain/lava.png
+share/wesnoth/images/terrain/mask.png
 share/wesnoth/images/terrain/mine.png
 share/wesnoth/images/terrain/mountains-n.png
 share/wesnoth/images/terrain/mountains-ne.png
@@ -524,10 +812,27 @@ share/wesnoth/images/terrain/ocean-s.png
 share/wesnoth/images/terrain/ocean-se.png
 share/wesnoth/images/terrain/ocean-sw.png
 share/wesnoth/images/terrain/ocean.png
+share/wesnoth/images/terrain/out.png
 share/wesnoth/images/terrain/pier.png
 share/wesnoth/images/terrain/road.png
 share/wesnoth/images/terrain/rocks.png
 share/wesnoth/images/terrain/signpost.png
+share/wesnoth/images/terrain/snow-forest-n.png
+share/wesnoth/images/terrain/snow-forest-ne.png
+share/wesnoth/images/terrain/snow-forest-nw.png
+share/wesnoth/images/terrain/snow-forest-s.png
+share/wesnoth/images/terrain/snow-forest-se.png
+share/wesnoth/images/terrain/snow-forest-sw.png
+share/wesnoth/images/terrain/snow-forest.png
+share/wesnoth/images/terrain/snow-hills-n-ne.png
+share/wesnoth/images/terrain/snow-hills-n.png
+share/wesnoth/images/terrain/snow-hills-ne.png
+share/wesnoth/images/terrain/snow-hills-nw.png
+share/wesnoth/images/terrain/snow-hills-s-sw.png
+share/wesnoth/images/terrain/snow-hills-s.png
+share/wesnoth/images/terrain/snow-hills-se.png
+share/wesnoth/images/terrain/snow-hills-sw.png
+share/wesnoth/images/terrain/snow-hills.png
 share/wesnoth/images/terrain/snow-n-ne-se-s.png
 share/wesnoth/images/terrain/snow-n-ne-se.png
 share/wesnoth/images/terrain/snow-n-ne.png
@@ -554,9 +859,17 @@ share/wesnoth/images/terrain/swampwater.png
 share/wesnoth/images/terrain/swampwater2.png
 share/wesnoth/images/terrain/swampwater3.png
 share/wesnoth/images/terrain/temple.png
+share/wesnoth/images/terrain/test.png
+share/wesnoth/images/terrain/void-n.png
+share/wesnoth/images/terrain/void-ne.png
+share/wesnoth/images/terrain/void-nw.png
+share/wesnoth/images/terrain/void-s.png
+share/wesnoth/images/terrain/void-se.png
+share/wesnoth/images/terrain/void-sw.png
 share/wesnoth/images/terrain/void.png
+share/wesnoth/images/thief-attack.png
+share/wesnoth/images/thief-defend.png
 share/wesnoth/images/thief.png
-share/wesnoth/images/title.png
 share/wesnoth/images/troll-grunt-attack.png
 share/wesnoth/images/troll-grunt.png
 share/wesnoth/images/troll-warrior-attack.png
@@ -567,13 +880,20 @@ share/wesnoth/images/troll-whelp.png
 share/wesnoth/images/undead-adept-attack.png
 share/wesnoth/images/undead-adept-defend.png
 share/wesnoth/images/undead-adept.png
+share/wesnoth/images/undead-ancient-lich-attack.png
+share/wesnoth/images/undead-ancient-lich-defend.png
 share/wesnoth/images/undead-ancient-lich.png
 share/wesnoth/images/undead-archer.png
+share/wesnoth/images/undead-bat-attack.png
 share/wesnoth/images/undead-bat.png
+share/wesnoth/images/undead-blackspell.png
 share/wesnoth/images/undead-bloodbat.png
 share/wesnoth/images/undead-boneshooter.png
 share/wesnoth/images/undead-chocobone.png
 share/wesnoth/images/undead-deathknight.png
+share/wesnoth/images/undead-ghost-attack.png
+share/wesnoth/images/undead-ghost-attack1.png
+share/wesnoth/images/undead-ghost-defend.png
 share/wesnoth/images/undead-ghost.png
 share/wesnoth/images/undead-ghoul-attack.png
 share/wesnoth/images/undead-ghoul-defend.png
@@ -583,29 +903,51 @@ share/wesnoth/images/undead-necromancer-attack.png
 share/wesnoth/images/undead-necromancer-attack2.png
 share/wesnoth/images/undead-necromancer-defend.png
 share/wesnoth/images/undead-necromancer.png
+share/wesnoth/images/undead-nightgaunt-attack.png
+share/wesnoth/images/undead-nightgaunt-attack2.png
+share/wesnoth/images/undead-nightgaunt-defend.png
+share/wesnoth/images/undead-nightgaunt.png
+share/wesnoth/images/undead-revenant-attack.png
 share/wesnoth/images/undead-revenant.png
+share/wesnoth/images/undead-shadow-attack.png
+share/wesnoth/images/undead-shadow-defend.png
+share/wesnoth/images/undead-shadow.png
+share/wesnoth/images/undead-skeleton-defend.png
 share/wesnoth/images/undead-skeleton.png
+share/wesnoth/images/undead-spectre-attack.png
+share/wesnoth/images/undead-spectre-attack1.png
+share/wesnoth/images/undead-spectre-defend.png
+share/wesnoth/images/undead-spectre.png
+share/wesnoth/images/undead-wraith-attack1.png
 share/wesnoth/images/undead-wraith.png
 share/wesnoth/images/undead-zombie-attack.png
 share/wesnoth/images/undead-zombie.png
 share/wesnoth/images/unmoved-energy.png
 share/wesnoth/images/water_spay.png
 share/wesnoth/images/web.png
+share/wesnoth/images/wesnoth-icon.png
 share/wesnoth/images/white-cleric.png
 share/wesnoth/images/white-mage.png
 share/wesnoth/images/whitemissile-n.png
 share/wesnoth/images/whitemissile-ne.png
 share/wesnoth/images/wolf-rider-attack.png
+share/wesnoth/images/wolf-rider-defend.png
 share/wesnoth/images/wolf-rider.png
+share/wesnoth/music/elf-land.ogg
+share/wesnoth/music/frantic.ogg
+share/wesnoth/music/underground.ogg
 share/wesnoth/music/wesnoth-1.ogg
 share/wesnoth/music/wesnoth-2.ogg
 share/wesnoth/music/wesnoth-3.ogg
 share/wesnoth/music/wesnoth-4.ogg
 share/wesnoth/music/wesnoth-5.ogg
 share/wesnoth/music/wesnoth-6.ogg
+share/wesnoth/music/wesnoth-7.ogg
+share/wesnoth/music/wesnoth-8.ogg
 share/wesnoth/sounds/arrow-hit.wav
 share/wesnoth/sounds/arrow-miss.wav
 share/wesnoth/sounds/bell.wav
+share/wesnoth/sounds/dart.wav
 share/wesnoth/sounds/fire.wav
 share/wesnoth/sounds/firearrow.wav
 share/wesnoth/sounds/fist-swish.wav
@@ -613,11 +955,20 @@ share/wesnoth/sounds/groan.wav
 share/wesnoth/sounds/gunshot.wav
 share/wesnoth/sounds/heal.wav
 share/wesnoth/sounds/horse-canter.wav
+share/wesnoth/sounds/knife.wav
 share/wesnoth/sounds/lightning.wav
+share/wesnoth/sounds/mace.wav
 share/wesnoth/sounds/magicmissile.wav
+share/wesnoth/sounds/mermen-hit.wav
+share/wesnoth/sounds/net.wav
 share/wesnoth/sounds/pistol.wav
+share/wesnoth/sounds/skeleton-hit.wav
+share/wesnoth/sounds/spear.wav
+share/wesnoth/sounds/staff.wav
 share/wesnoth/sounds/sword-clang.wav
 share/wesnoth/sounds/sword-swish.wav
+share/wesnoth/sounds/ugg.wav
+share/wesnoth/sounds/wolf-cry.wav
 @dirrm share/wesnoth/sounds
 @dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/terrain
@@ -627,6 +978,7 @@ share/wesnoth/sounds/sword-swish.wav
 @dirrm share/wesnoth/fonts
 @dirrm share/wesnoth/data/units
 @dirrm share/wesnoth/data/translations
+@dirrm share/wesnoth/data/themes
 @dirrm share/wesnoth/data/scenarios
 @dirrm share/wesnoth/data/maps
 @dirrm share/wesnoth/data