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

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