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

* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
  Import translations. DO NOT MERGE