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

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