am 425f92b5: (-s ours) am 2d16e4e7: Import translations. DO NOT MERGE

* commit '425f92b5c168cd91536600051decf31fb34baf2d':
  Import translations. DO NOT MERGE