am b14d55a4: (-s ours) am b1835173: (-s ours) am 3e807b1b: (-s ours) Import translations. DO NOT MERGE

* commit 'b14d55a4a2c207bdd2375a831072b8a9d1b8017b':
  Import translations. DO NOT MERGE