am b47265a1: (-s ours) am d6afe94a: (-s ours) am fa455b47: am ef489fe9: Import translations. DO NOT MERGE

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