am ae9ed147: (-s ours) am 51b51ca6: (-s ours) Import translations. DO NOT MERGE

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