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

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