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

* commit '06d3867b1d96c3ad73d677e7c04a8d94b9f93c8b':
  Import translations. DO NOT MERGE