Import translations. DO NOT MERGE
am: c3ecad6f0a  -s ours

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