Move the Troll Shan into core, since both DiD and UtBS use it.

data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg

@@ -1,87 +0,0 @@
-#textdomain wesnoth-did
-[unit]
-    id=Troll Shaman
-    name= _ "Troll Shaman"
-    race=troll
-    image=troll-shaman.png
-    {MAGENTA_IS_THE_TEAM_COLOR}
-    [abilities]
-        {ABILITY_REGENERATES}
-    [/abilities]
-    hitpoints=50
-    movement_type=largefoot
-    [resistance]
-        pierce=90
-    [/resistance]
-    movement=5
-    experience=150
-    level=2
-    alignment=chaotic
-    advanceto=null
-    {AMLA_DEFAULT}
-    cost=32
-    usage=mixed fighter
-    unit_description= _ "Troll shamans are the mystical leaders of the trolls. Though not as strong or tough as other trolls, their true power lies in their fire magic, which they use to blast enemies with gouts of fire."+{SPECIAL_NOTES}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_MAGICAL}
-    {DEFENSE_ANIM "units/troll-shaman-defend.png" "units/troll-shaman.png" {SOUND_LIST:TROLL_HIT} }
-    die_sound={SOUND_LIST:TROLL_DIE}
-    #melee attack should be worse than troll rocklobber,
-    #since shaman has suck a better ranged attack
-    [attack]
-        name=fist
-        description= _"fist"
-        icon=attacks/fist-troll.png
-        type=impact
-        range=melee
-        damage=7
-        number=2
-    [/attack]
-    #with underground bonus, troll actually gets 10-3 attack
-    [attack]
-        name=flame blast
-        description= _"flame blast"
-        type=fire
-        [specials]
-            {WEAPON_SPECIAL_MAGICAL}
-        [/specials]
-        range=ranged
-        damage=7
-        number=3
-        icon=attacks/fireball.png
-    [/attack]
-    [attack_anim]
-        [attack_filter]
-            name=flame blast
-        [/attack_filter]
-        {MISSILE_FRAME_FIREBALL}
-
-        [frame]
-            sound=fire.wav
-            begin=-200
-            end=0
-            image=units/troll-shaman-ranged.png
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [attack_filter]
-            name=fist
-        [/attack_filter]
-        [if]
-            hits=yes
-            [frame]
-                sound=fist.ogg
-                begin=-150
-                end=150
-                image=units/troll-shaman-melee.png
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                sound={SOUND_LIST:MISS}
-                begin=-150
-                end=150
-                image=units/troll-shaman-melee.png
-            [/frame]
-        [/else]
-    [/attack_anim]
-[/unit]

data/core/units/Troll_Shaman.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth
 [unit]
     id=Troll Shaman
     name= _ "Troll Shaman"