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

* commit '12bfcc3083647520216d9e07296dd5a333cd959c':
  Import translations. DO NOT MERGE