am 35fbb9f9: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '35fbb9f9e59795e233fb59cb5a87573e4669aebd':
  Import translations. DO NOT MERGE