am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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