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

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