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

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