CC-4734: French - UI breaks in several places
Removed useless code
Small localization(Spanish) change