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

* commit '697184b56f918799440bf7749ea8c1e636a63725':
  Import translations. DO NOT MERGE