Asked my girlfriend whom is a warrior.
I don't think anyone nowadays is actually a warrior. If she's in the military, she's a soldier.
Was that intended to be funny?
Actually, I tend to agree with that. I dislike the term "warrior", as I perceive it as defining someone who fights solely for the sake of fighting. A soldier, on the other hand, is someone who fights for duty and service. Not a matter of being PC (unlike the OP), just my viewpoint.