am 36285367: (-s ours) am b1e69ff1: Import translations. DO NOT MERGE

* commit '36285367fd33b2210cbecec67aade65399c7d149':
  Import translations. DO NOT MERGE