am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit '7021c6e6df25fc2d100d8351be0eab1605c1693d':
  Import translations. DO NOT MERGE