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

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