am f20d3cc1: am c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE

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