Error fix for translate.rb and new language templates

Getting lots of language queries now :)
Merge remote-tracking branch 'upstream/master'