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

* commit '7833e5f53228dd3f34c0f41550fea8564ed3222a':
  Import translations. DO NOT MERGE