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

* commit '54064f66c949fa4069b4abb025c31afe28ac98ab':
  Import translations. DO NOT MERGE