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

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