am 89585a17: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '89585a179c61300c2f0239975b190196ce9f23dc':
  Import translations. DO NOT MERGE