am bfeefec9: (-s ours) am b17dae80: (-s ours) am 4c900d88: (-s ours) Import translations. DO NOT MERGE

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