am f17a6d3c: (-s ours) am 2f19129d: (-s ours) Import translations. DO NOT MERGE

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