am b17dae80: (-s ours) am 4c900d88: (-s ours) Import translations. DO NOT MERGE

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