Fix Git > Merge issues with © and ° characters

Seems to be a locale issue when merging some requests.  Odd.

Also, minor adjustments to the updated Color Balance dialog to account
for variable translation width.