at Gazebo
The diplo GP is probably better fit if we can also have diplo specialists.
at Txurce
What do you think if what I discussed in my last post with Thalassicus? It reduces the number back to 6 traits. Not those you've been advocating, but I think it does a good job of making each one unique enough.
at Thalassicus
Yes, I remember the generic yield thing and am excited to see it implemented with the

cultural city-states.
I don't think a terrain promotion would suit them well. Barbarians are savages that raid the surroundings from their chosen biotope, while the

s are small nations that cultivate their surroundings. I am more in favour of stressing their foreign descent (for gifted units). Making them maintenance free would possibly be overpowered, but for example an adjacency bonus between gifted units could work, if that doesn't trivialise the French musketeers. It could also be their own special promotion, which I imagine would help them defend their small plot of land.
Lending you a general/tactician that works like a weaker great general, but also gives a certain amount of XP distributed over the units within a radius of 1 could work. You could make the latter only activate if the player told the

to 'do not gift units', so he can toggle between more units and more experience.
Alternatively hostile

military

could give units, while Neutral(?) ones would give experience and the Irrational ones would randomly pick one of the two. I don't know how to extrapolate this functionality to the other traits though.
at Zyxpsylon
Yes, quite happy I got the new traits in. In the end it was quite easy. Apart from the UI support, which still isn't complete.
As for an icon, I don't really know. Maybe the same I used for the tops? (Attached the file I used for it.)
And Manhattan will only really be of use when we can tackle the diplo victory itself.
at black213
The bonuses work for me. Maybe the lack of UI support is what confuses you. The name for the trait will not show up in the DiploList or DiploRelationships, only in the DiploPopup. I could easily include that UI support, but it would mean overwriting source files, which I want to avoid so I don't overwrite possible changes made to those files by other mods, changes that could be more functional than this purely cosmetic one.
The bonus also doesn't show up in the TopPanel, so for example it won't show the gold you'll receive from a commercial city-state. Same reason as above.
If you compare what the game says you'll get with what you'll actually get, you'll see it's more, which are the new traits at work.