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

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