am b3f4b48e: (-s ours) Import translations. DO NOT MERGE

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