am b3d3e790: (-s ours) am 0e0b8883: (-s ours) Import translations. DO NOT MERGE

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