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

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