Civ Traits vs. Leader Traits

Does anyone have an opinion on whether the Civ-based traits (Tolerant, Cooperative, etc.) are more powerful than leader-based ones (Disciplined, Liberatarian, etc.)? In other words, when creating a new leader should you avoid giving him two civ-based traits? Ex: Tolerant and Cooperative.

I was wondering because I am putting together a Portugal mod and my thinking was that each Civilization should have its own unique trait and so borrowing from the other Civs trait would detract from the game, whereas borrowing other leader traits like Disciplined would be fine.

Any thoughts?

I think the Civ trait should be unique, and an actual cultural trait of that people (like religious tolerance). Whereas the leader traits should be based on the morals of that particular leader.