am 6ca1e48e: (-s ours) am a62f50c9: (-s ours) Import translations. DO NOT MERGE

* commit '6ca1e48e62252be805e194f352f788accb1049af':
  Import translations. DO NOT MERGE