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

* commit '6fd8ce222dc4f5486efe105a3c3716d03715c4ea':
  Import translations. DO NOT MERGE