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

* commit '587ab41709416cd7d5f546e87e522b9ed3c9b93c':
  Import translations. DO NOT MERGE