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

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