Added a bunch of translation stuff from #338, #339, #340, #349, #362, #370