This includes the contents in the previous two pull requests.(#945 and #972 ) Also improved another few translations.