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

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