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

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