am b1147ee0: (-s ours) am 1f295594: (-s ours) Import translations. DO NOT MERGE

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