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

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