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

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