Personality

personality traits:  This is a relatively permanent individual characteristic.  For example, introverted, extroverted, quiet, arrogant etc.  These are used to describe generally someone's 'personality'.  

Personality states:  These are a temporary change in personality.  For example, a mood being; angry, depressed etc.

a personality state may be a personality trait and vice versa.