Source : Webster's Revised Unabridged Dictionary (1913)

Diplomat \Dip"lo*mat\, Diplomate \Dip"lo*mate\, n. [F.
   diplomate.]
   A diplomatist.

Source : WordNet®

diplomat
     n 1: an official engaged in international negotiations [syn: {diplomatist}]
     2: a person who deals tactfully with others