am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE

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