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

* commit '60835d4be46caff5d5b62ffb19031b580d42b504':
  Import translations. DO NOT MERGE