am cc88d8dc: (-s ours) am a0b80f05: (-s ours) am 7dd8b649: (-s ours) Import translations. DO NOT MERGE

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