am 3cc88277: (-s ours) am 122d534e: (-s ours) Import translations. DO NOT MERGE

* commit '3cc88277daa69dc7af1b0b27312bbcfcb086e81b':
  Import translations. DO NOT MERGE