Cherry picking commits from a spoilt copy of the repo. Car can now translate. Untested