Merge website translation changes by @solarpete