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

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