am 389609b8: (-s ours) am a645e590: (-s ours) Import translations. DO NOT MERGE

* commit '389609b8defb029f52ca52abab60f3686a1fb9cc':
  Import translations. DO NOT MERGE