am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521  -s ours

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