am 2c31ddd2: (-s ours) am 420584e5: (-s ours) Import translations. DO NOT MERGE

* commit '2c31ddd20be80e78286a4956b6b7a6b38b25c617':
  Import translations. DO NOT MERGE