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

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