Fix translation script, make it read UTF-8 source files correctly
Merge branch '2.5.x' into saas