am ed9ef5a7: (-s ours) am af77854a: am 31a70de6: Import translations. DO NOT MERGE

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