am 42d97684: am a0fbc220: Import translations. DO NOT MERGE

* commit '42d976842081d3e40cdc68774573fedd90f21575':
  Import translations. DO NOT MERGE