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

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