Swapped pirate and barbarian flags

Suggested by Anonymous

See bug #22236


git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@25315 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
Removed DiplomatDefense-flag from civ2civ3 airbase, as there's no units that
would benefit from it.

Reported by Jacob Nevins <jtn>
Patch by David Fernandez <bardo>

See bug #22188


git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@25317 a0f10bec-cc02-0410-94fc-a9cfff90b4cd