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

* commit '23c73693ad261a61c076d99a01a175241d1d2ab2':
  Import translations. DO NOT MERGE