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

* commit '04ca8e577859235a68fa9a5268af528d547310be':
  Import translations. DO NOT MERGE