More updates to translation and automated in CMake