20141109 - Replaced language keys with something better