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

* commit 'c2585467107995f3130872eb7b721f3dbbcdf505':
  Import translations. DO NOT MERGE