am 618e4884: (-s ours) am 9ba442dd: Import translations. DO NOT MERGE

* commit '618e4884973866e6943580490c06b73460fad402':
  Import translations. DO NOT MERGE