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

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