It's the common definition.
No, it isn't.
Those sound more like legal terms that have nothing to do with how you feel and more to do with the extent that the law refrains from punishing someone.
They're more associated with the concept of forgiveness, and forgiveness is much more than calming down after being upset. The law enshrines forgiveness in one way, but that doesn't make forgiveness only a legal term.
Forgiveness can't come about unless you have feelings of anger or resentment towards something. The whole point is that you shouldn't harbor those feelings because they cause further harm.
Not anger or resentment, necessarily; forgiveness comes out of being wronged, either directly or indirectly. People often get angry about being wronged, but we can still feel wronged without feeling angry about it.
Instead of practicing Ahimsa, you enter into and perpetuate violence and the cycle of suffering.
There's a Japanese expression that I agree with: "the killing sword is the life-giving sword." Sometimes, the way to the least violence overall is to use violence to stop someone from committing even more violence.
The question of whether you should get angry in the first place is a separate question with it's own complexities. Hitler is dead (more than 50 years dead). Are you still angry with him? Who's going to pay for your anger? If you found out Hitler had children would you want to hunt them down and kill them because of how you felt about Hitler?
Who's going to pay for your anger? Your next door neighbor? O sorry man, I was just thinking about how horrible Hitler was and the terrible genocide that occurred. I'm sorry I ran over your dog. Give it up man. Let it go.
Are you even trying to make sense?
Back up, stop assuming things about what I feel or believe, and try again.
The are healthy and unhealthy ways to express anger. Healthy: campaigning against Noe-Nazis; unhealthy: running over your neighbour's dog.
BTW: is that how you express anger when you have it? Do you end up lashing out with murderous rage at people and animals? Because if you do, you really ought to see someone to work on your coping skills.
But if not, you should have known better than to portray someone else that way.
Some people think "caring" means "getting angry". They are confused. You don't have to be angry to want to do the right thing. If you have to get angry to want to do the right thing, then something is wrong man.
How we feel, positive or negative, motivates us. If you're content with anything, you'll put up with anything.