am 2c975eda: (-s ours) am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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