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

* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE