am ba237151: am 9968b523: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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