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

* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE