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

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