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

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