For the Thunder Cage message just search for "msg = _INTL("{1} was wrapped by {2}!",target.pbThis,user.pbThis(true))" And add this under it:
elsif isConst?(@id,PBMoves,:THUNDERCAGE)
msg = _INTL("{1} trapped {2}!",user.pbThis,target.pbThis(true))
Can be found in "move effects 080-0FF"...