am 90929139: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '909291392c56e591cf6fe40beb160897daf212fd':
  Import translations. DO NOT MERGE