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

* commit '620be98feb47f7dd66ce70cbdba2128737621fa3':
  Import translations. DO NOT MERGE