am 3676d770: (-s ours) am 64ef17b7: (-s ours) Import translations. DO NOT MERGE

* commit '3676d7703df67c756821a80b144f0dcad30e67d3':
  Import translations. DO NOT MERGE