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

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