am 2632b25f: (-s ours) am fba8cd35: (-s ours) Import translations. DO NOT MERGE

* commit '2632b25fae55411ff4974d510d599af75d35045a':
  Import translations. DO NOT MERGE