am 31aa2c3a: (-s ours) am 727f8d40: (-s ours) Import translations. DO NOT MERGE

* commit '31aa2c3a95bf016afb90324388f7a67c74360679':
  Import translations. DO NOT MERGE