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

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