20141116 - Replaced language keys with something better